summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorhrydgard <hrydgard@gmail.com>2008-11-30 14:11:16 +0000
committerhrydgard <hrydgard@gmail.com>2008-11-30 14:11:16 +0000
commit9ed23af1c2a30bc29f01e83996ccee060dfcfc69 (patch)
tree6029ba495310a33ef72b767709f910c8e01243e6 /Source/Core
parent148aa7c326139a08ac8d38218376e67ee11b0023 (diff)
Tweak some strings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1340 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinWX/Src/AboutDolphin.cpp14
-rw-r--r--Source/Core/DolphinWX/Src/GameListCtrl.cpp4
-rw-r--r--Source/Core/DolphinWX/Src/Main.cpp6
3 files changed, 11 insertions, 13 deletions
diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.cpp b/Source/Core/DolphinWX/Src/AboutDolphin.cpp
index 80655afd59..60d7c8e811 100644
--- a/Source/Core/DolphinWX/Src/AboutDolphin.cpp
+++ b/Source/Core/DolphinWX/Src/AboutDolphin.cpp
@@ -46,18 +46,16 @@ void AboutDolphin::CreateGUIControls()
sbDolphinLogo = new wxStaticBitmap(this, ID_LOGO, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0);
sbDolphinLogo->SetBitmap(*DolphinLogo);
std::string Text = std::string("Dolphin SVN revision ") + SVN_REV_STR + "\nCPU: " + cpu_info.Summarize() + "\n\n" // Maybe add OS/arch info too?
- "Copyright (c) by F|RES, ector, yaz0r 2003-2008\n"
- "Additional code by Schibo and Costis.\n\n"
- "Greets to Azimer, Caustik, Costis, Cyrus64, Desktopman, Epsilon, Hotquik, Jazzmin, mamedevs, (Lazer)Maksen, Martin64, or9, Runik, Schibo,"
- " SculleatR, tmbinc, vEX, Zezu, Zilmar, and everyone we forget.\n\n"
+ "Copyright (c) by F|RES & ector 2003-2008\n"
+ "Additional code by zerofrog, yaz0r, Schibo, Costis, JPeterson, etc etc...\n\n"
+ "Greets to Azimer, Caustik, Costis, Desktopman, EFX, Epsilon, Falcon4Ever, Hotquik, Jazzmin, mamedevs, Masken, Martin64, or9, "
+ " tmbinc, vEX, Zezu, Zilmar, and everyone we forget.\n\n"
"Special thanks to Costis, CrowTRobo, Titanik, or9 and Hotquik for their reverse engineering and docs/demos.\n\n"
- "Big thanks to Gilles Mouchard whose Microlib PPC emulator gave our development a kickstart. "
- "Note that Dolphin no longer uses a single line of code from it, and the first release had practically nothing left from it either.\n\n"
+ "Big thanks to Gilles Mouchard whose Microlib PPC emulator gave our development a kickstart.\n\n"
"Thanks to Frank Wille for his PowerPC disassembler, which or9 and we modified to include Gekko specifics.\n\n"
"Thanks to Shinji Chiba for his GC ADPCM decoder.\n\n"
"We are not affiliated with Nintendo in any way. Gamecube and Wii are trademarks of Nintendo.\n"
- "The emulator is for educational purposes only and we do not support using this emulator to play games you do not legally own.\n\n"
- "Beta testers: EFX, Falcon4ever and Shadowprince (kx).";
+ "The emulator is for educational purposes only and should not be used to play games you do not legally own.\n\n";
Message = new wxStaticText(this, ID_MESSAGE,
wxString::FromAscii(Text.c_str()),
wxDefaultPosition, wxDefaultSize, 0);
diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
index cdf1d7c50c..73d20edc5d 100644
--- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
@@ -494,9 +494,9 @@ void CGameListCtrl::OnRightClick(wxMouseEvent& event)
popupMenu.Append(IDM_DELETEGCM, _("&Delete ISO..."));
if (selected_iso->IsCompressed())
- popupMenu.Append(IDM_COMPRESSGCM, _("Decompress ISO... (UNTESTED)"));
+ popupMenu.Append(IDM_COMPRESSGCM, _("Decompress ISO..."));
else
- popupMenu.Append(IDM_COMPRESSGCM, _("Compress ISO... (UNTESTED)"));
+ popupMenu.Append(IDM_COMPRESSGCM, _("Compress ISO..."));
PopupMenu(&popupMenu);
}
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index ec6af20b2b..19b9b8dce9 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -331,9 +331,9 @@ void Host_SetWiiMoteConnectionState(int _State)
switch(_State)
{
- case 0: event.SetString(wxString::FromAscii("not connected")); break;
- case 1: event.SetString(wxString::FromAscii("connecting...")); break;
- case 2: event.SetString(wxString::FromAscii("connected!")); break;
+ case 0: event.SetString(wxString::FromAscii("Not connected")); break;
+ case 1: event.SetString(wxString::FromAscii("Connecting...")); break;
+ case 2: event.SetString(wxString::FromAscii("Wiimote Connected")); break;
}
event.SetInt(1);