Fixed some grammatical mistakes

Utilities/AutoPause.cpp

@@ -16,7 +16,7 @@ AutoPause& AutoPause::getInstance(void)
 	return *gAutoPause;
 }
 
-//Still use binary format. Default Setting should be "disable all auto-pause".
+//Still use binary format. Default Setting should be "disable all auto pause".
 AutoPause::AutoPause(void)
 {
 	m_pause_function.reserve(16);
@@ -36,7 +36,7 @@ AutoPause::~AutoPause(void)
 	m_pause_syscall_enable = false;
 }
 
-//Load Auto-Pause Configuration from file "pause.bin"
+//Load Auto Pause Configuration from file "pause.bin"
 //This would be able to create in a GUI window.
 void AutoPause::Reload(void)
 {
@@ -65,19 +65,19 @@ void AutoPause::Reload(void)
 				//Less than 1024 - be regarded as a system call.
 				//emplace_back may not cause reductant move/copy operation.
 				m_pause_syscall.emplace_back(num);
-				LOG_WARNING(HLE, "Auto-Pause: Find System Call ID %x", num);
+				LOG_WARNING(HLE, "Auto Pause: Find System Call ID %x", num);
 			}
 			else
 			{
 				m_pause_function.emplace_back(num);
-				LOG_WARNING(HLE, "Auto-Pause: Find Function Call ID %x", num);
+				LOG_WARNING(HLE, "Auto Pause: Find Function Call ID %x", num);
 			}
 		}
 		list.Close();
 	}
 	else
 	{
-		LOG_WARNING(HLE, "No Pause ID specified in pause.bin, Auto-Pause would not act.");
+		LOG_WARNING(HLE, "No pause.bin found, Auto Pause will not work.");
 	}
 	m_pause_syscall_enable = Ini.DBGAutoPauseSystemCall.GetValue();
 	m_pause_function_enable = Ini.DBGAutoPauseFunctionCall.GetValue();
@@ -99,7 +99,7 @@ void AutoPause::TryPause(u32 code) {
 			if (code == m_pause_syscall[i])
 			{
 				Emu.Pause();
-				LOG_ERROR(HLE, "Auto-Pause Triggered: System call %x", code);	//Used Error
+				LOG_ERROR(HLE, "Auto Pause Triggered: System call %x", code);	//Used Error
 			}
 		}
 	}
@@ -117,7 +117,7 @@ void AutoPause::TryPause(u32 code) {
 			if (code == m_pause_function[i])
 			{
 				Emu.Pause();
-				LOG_ERROR(HLE, "Auto-Pause Triggered: Function call %x", code);	//Used Error
+				LOG_ERROR(HLE, "Auto Pause Triggered: Function call %x", code);	//Used Error
 			}
 		}
 	}

rpcs3/Emu/SysCalls/SysCalls.cpp

@@ -920,7 +920,7 @@ void default_syscall()
 
 void SysCalls::DoSyscall(u32 code)
 {
-	//Auto-Pause using simple singleton.
+	//Auto Pause using simple singleton.
 	Debug::AutoPause::getInstance().TryPause(code);
 
 	if(code < 1024)

rpcs3/Gui/AutoPauseManager.cpp

@@ -11,7 +11,7 @@ enum
 
 //TODO::Get the enable configuration from ini.
 AutoPauseManagerDialog::AutoPauseManagerDialog(wxWindow* parent)
-	: wxDialog(parent, wxID_ANY, "Auto-Pause Manager")
+	: wxDialog(parent, wxID_ANY, "Auto Pause Manager")
 {
 	SetMinSize(wxSize(400, 360));
 
@@ -19,8 +19,7 @@ AutoPauseManagerDialog::AutoPauseManagerDialog(wxWindow* parent)
 
 	m_entry_convert.clear();
 	m_entry_convert.str("");
-	m_entry_convert << "To use Auto-Pause: need the IDs of Function call or System call. Need Restart game."
+	m_entry_convert << "To use auto pause: enter the ID(s) of a function or a system call. Restart of the game is required to apply. You can enable/disable this in the settings.";
-		<< " Disable/enable using setting Misc.";
 
 	wxStaticText* s_description = new wxStaticText(this, wxID_ANY, m_entry_convert.str(),wxDefaultPosition, wxDefaultSize, 0);
 	s_description->Wrap(400);
@@ -197,7 +196,7 @@ void AutoPauseManagerDialog::OnRemove(wxCommandEvent& event)
 void AutoPauseManagerDialog::OnSave(wxCommandEvent& event)
 {
 	SaveEntries();
-	LOG_SUCCESS(HLE,"Auto-Pause: File pause.bin was updated.");
+	LOG_SUCCESS(HLE,"Auto Pause: File pause.bin was updated.");
 	//event.Skip();
 }
 
@@ -214,7 +213,7 @@ void AutoPauseManagerDialog::OnReload(wxCommandEvent& event)
 }
 
 AutoPauseSettingsDialog::AutoPauseSettingsDialog(wxWindow* parent, u32 *entry)
-	: wxDialog(parent, wxID_ANY, "Auto-Pause Setting")
+	: wxDialog(parent, wxID_ANY, "Auto Pause Setting")
 	, m_presult(entry)
 {
 	m_entry = *m_presult;
@@ -225,8 +224,7 @@ AutoPauseSettingsDialog::AutoPauseSettingsDialog(wxWindow* parent, u32 *entry)
 
 	m_entry_convert.clear();
 	m_entry_convert.str("");
-	m_entry_convert << "Specify ID of System Call or Function Call below."
+	m_entry_convert << "Specify ID of System Call or Function Call below. You need to use a Hexadecimal ID.";
-		<< " Please remember give the Hexidemical id.";
 
 	wxStaticText* s_description = new wxStaticText(this, wxID_ANY, m_entry_convert.str(), wxDefaultPosition, wxDefaultSize, 0);
 	s_description->Wrap(400);
@@ -249,7 +247,7 @@ AutoPauseSettingsDialog::AutoPauseSettingsDialog(wxWindow* parent, u32 *entry)
 	m_entry_convert << std::hex << std::setw(8) << std::setfill('0') << m_entry;
 	m_id->SetValue(m_entry_convert.str());
 
-	SetTitle("Auto-Pause Setting: "+m_entry_convert.str());
+	SetTitle("Auto Pause Setting: "+m_entry_convert.str());
 
 	Bind(wxEVT_BUTTON, &AutoPauseSettingsDialog::OnOk, this, wxID_OK);
 	Bind(wxEVT_TEXT, &AutoPauseSettingsDialog::OnUpdateValue, this, wxID_STATIC);

rpcs3/Gui/ConLogFrame.cpp

@@ -180,7 +180,7 @@ void LogFrame::OnRightClick(wxMouseEvent& event)
 {
 	wxMenu* menu = new wxMenu();
 
-	menu->Append(id_log_copy, "&Copy Ctrl+C");
+	menu->Append(id_log_copy, "&Copy");
 	menu->AppendSeparator();
 	menu->Append(id_log_clear, "C&lear");
 

rpcs3/Gui/MainFrame.cpp

@@ -89,7 +89,7 @@ MainFrame::MainFrame()
 	menu_conf->Append(id_config_emu, "Settings");
 	menu_conf->Append(id_config_pad, "PAD Settings");
 	menu_conf->AppendSeparator();
-	menu_conf->Append(id_config_autopause_manager, "Auto-Pause Settings");
+	menu_conf->Append(id_config_autopause_manager, "Auto Pause Settings");
 	menu_conf->AppendSeparator();
 	menu_conf->Append(id_config_vfs_manager, "Virtual File System Manager");
 	menu_conf->Append(id_config_vhdd_manager, "Virtual HDD Manager");
@@ -398,9 +398,10 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event))
 	wxCheckBox* chbox_hle_savetty         = new wxCheckBox(p_hle, wxID_ANY, "Save TTY output to file");
 	wxCheckBox* chbox_hle_exitonstop      = new wxCheckBox(p_hle, wxID_ANY, "Exit RPCS3 when process finishes");
 	wxCheckBox* chbox_hle_always_start    = new wxCheckBox(p_hle, wxID_ANY, "Always start after boot");
-	//Auto-Pause related
+
-	wxCheckBox* chbox_dbg_ap_systemcall   = new wxCheckBox(p_hle, wxID_ANY, "Auto-Pause at System Call");
+	//Auto Pause
-	wxCheckBox* chbox_dbg_ap_functioncall = new wxCheckBox(p_hle, wxID_ANY, "Auto-Pause at Function Call");
+	wxCheckBox* chbox_dbg_ap_systemcall   = new wxCheckBox(p_hle, wxID_ANY, "Auto Pause at System Call");
+	wxCheckBox* chbox_dbg_ap_functioncall = new wxCheckBox(p_hle, wxID_ANY, "Auto Pause at Function Call");
 
 	cbox_cpu_decoder->Append("PPU Interpreter & DisAsm");
 	cbox_cpu_decoder->Append("PPU Interpreter");
@@ -463,7 +464,6 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event))
 	cbox_sys_lang->Append("Polish");
 	cbox_sys_lang->Append("English (UK)");
 
-
 	// Get values from .ini
 	chbox_gs_log_prog        ->SetValue(Ini.GSLogPrograms.GetValue());
 	chbox_gs_dump_depth      ->SetValue(Ini.GSDumpDepthBuffer.GetValue());
@@ -476,7 +476,8 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event))
 	chbox_hle_savetty        ->SetValue(Ini.HLESaveTTY.GetValue());
 	chbox_hle_exitonstop     ->SetValue(Ini.HLEExitOnStop.GetValue());
 	chbox_hle_always_start   ->SetValue(Ini.HLEAlwaysStart.GetValue());
-	//Auto-Pause related
+
+	//Auto Pause related
 	chbox_dbg_ap_systemcall  ->SetValue(Ini.DBGAutoPauseSystemCall.GetValue());
 	chbox_dbg_ap_functioncall->SetValue(Ini.DBGAutoPauseFunctionCall.GetValue());
 
@@ -492,14 +493,12 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event))
 	cbox_hle_loglvl      ->SetSelection(Ini.HLELogLvl.GetValue());
 	cbox_sys_lang        ->SetSelection(Ini.SysLanguage.GetValue());
 	
-
 	// Enable/Disable parameters
 	chbox_audio_dump->Enable(Emu.IsStopped());
 	chbox_audio_conv->Enable(Emu.IsStopped());
 	chbox_hle_logging->Enable(Emu.IsStopped());
 	chbox_hle_hook_stfunc->Enable(Emu.IsStopped());
 
-
 	s_round_cpu_decoder->Add(cbox_cpu_decoder, wxSizerFlags().Border(wxALL, 5).Expand());
 	s_round_spu_decoder->Add(cbox_spu_decoder, wxSizerFlags().Border(wxALL, 5).Expand());
 
@@ -547,7 +546,8 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event))
 	s_subpanel_hle->Add(chbox_hle_savetty, wxSizerFlags().Border(wxALL, 5).Expand());
 	s_subpanel_hle->Add(chbox_hle_exitonstop, wxSizerFlags().Border(wxALL, 5).Expand());
 	s_subpanel_hle->Add(chbox_hle_always_start, wxSizerFlags().Border(wxALL, 5).Expand());
-	//Auto-Pause
+
+	//Auto Pause
 	s_subpanel_hle->Add(chbox_dbg_ap_systemcall, wxSizerFlags().Border(wxALL, 5).Expand());
 	s_subpanel_hle->Add(chbox_dbg_ap_functioncall, wxSizerFlags().Border(wxALL, 5).Expand());
 
@@ -594,7 +594,8 @@ void MainFrame::Config(wxCommandEvent& WXUNUSED(event))
 		Ini.HLELogLvl.SetValue(cbox_hle_loglvl->GetSelection());
 		Ini.SysLanguage.SetValue(cbox_sys_lang->GetSelection());
 		Ini.HLEAlwaysStart.SetValue(chbox_hle_always_start->GetValue());
-		//Auto-Pause
+
+		//Auto Pause
 		Ini.DBGAutoPauseFunctionCall.SetValue(chbox_dbg_ap_functioncall->GetValue());
 		Ini.DBGAutoPauseSystemCall.SetValue(chbox_dbg_ap_systemcall->GetValue());
 

rpcs3/Gui/SaveDataUtility.cpp

@@ -52,7 +52,7 @@ void SaveDataInfoDialog::UpdateData()
 	m_list->SetItem(3, 1, "Stub it first");
 
 	m_list->InsertItem(4, 4);
-	m_list->SetItem(4, 0, "Copy-Able?");
+	m_list->SetItem(4, 0, "Copyable");
 	m_list->SetItem(4, 1, "1 (Not allowed)");
 
 	m_list->InsertItem(5, 5);
@@ -105,7 +105,7 @@ SaveDataManageDialog::SaveDataManageDialog(wxWindow* parent, unsigned int* sort_
 	m_sort_options->SetSelection(*m_sort_type);
 	s_sort->Add(m_sort_options, 1, wxALL | wxEXPAND, 5);
 
-	wxButton* s_sort_action = new wxButton(this, wxID_ANY, wxT("&Apply!"), wxDefaultPosition, wxDefaultSize, 0);
+	wxButton* s_sort_action = new wxButton(this, wxID_ANY, wxT("&Apply"), wxDefaultPosition, wxDefaultSize, 0);
 	s_sort_action->Bind(wxEVT_BUTTON, &SaveDataManageDialog::OnApplySort, this);
 	s_sort->Add(s_sort_action, 0, wxALL, 5);
 	
@@ -173,8 +173,7 @@ SaveDataListDialog::SaveDataListDialog(wxWindow* parent, bool enable_manage)
 
 	m_entry_convert.clear();
 	m_entry_convert.str("");
-	m_entry_convert << "This is only a stub now. Don't expect real effect from this."
+	m_entry_convert << "This is only a stub for now. This doesn't work yet due to related functions not being implemented.";
-		<< "Cause related functions hasn't been implemented yet.";
 	wxStaticText* s_description = new wxStaticText(this, wxID_ANY, m_entry_convert.str(), wxDefaultPosition, wxDefaultSize, 0);
 	s_description->Wrap(400);
 	s_main->Add(s_description, 0, wxALL, 5);

rpcs3/Ini.h

@@ -152,7 +152,7 @@ public:
 	IniEntry<u8>   HLELogLvl;
 	IniEntry<bool> HLEAlwaysStart;
 
-	//Auto-Pause
+	//Auto Pause
 	IniEntry<bool> DBGAutoPauseSystemCall;
 	IniEntry<bool> DBGAutoPauseFunctionCall;
 
@@ -221,7 +221,7 @@ public:
 		HLELogLvl.Init("HLE_HLELogLvl", path);
 		HLEAlwaysStart.Init("HLE_HLEAlwaysStart", path);
 
-		// Auto-Pause
+		// Auto Pause
 		DBGAutoPauseFunctionCall.Init("DBG_AutoPauseFunctionCall", path);
 		DBGAutoPauseSystemCall.Init("DBG_AutoPauseSystemCall", path);
 
@@ -285,7 +285,8 @@ public:
 		HLEExitOnStop.Load(false);
 		HLELogLvl.Load(3);
 		HLEAlwaysStart.Load(true);
-		//Auto-Pause
+
+		//Auto Pause
 		DBGAutoPauseFunctionCall.Load(false);
 		DBGAutoPauseSystemCall.Load(false);
 
@@ -350,7 +351,8 @@ public:
 		HLEExitOnStop.Save();
 		HLELogLvl.Save();
 		HLEAlwaysStart.Save();
-		//Auto-Pause
+
+		//Auto Pause
 		DBGAutoPauseFunctionCall.Save();
 		DBGAutoPauseSystemCall.Save();