Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the panic alert hack for windows and osx. The macro needed to be defined after HAVE_WX is defined. That explains why windows accepted the string concatenation that I thought it wouldn't.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6829 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2011-01-12 18:09:16 +00:00
parent d5b7c5802e
commit fcd72bdba9
22 changed files with 669 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Languages/dolphin-emu.pot
+41 -41
View File
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Dolphin Emu\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-01-12 07:13-0600\n"
"POT-Creation-Date: 2011-01-12 12:07-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -53,7 +53,7 @@ msgstr ""
msgid "%d %%"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:771
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:768
#, c-format
msgid "%d Free Blocks; %d Free Dir Entries"
msgstr ""
@@ -442,7 +442,7 @@ msgstr ""
msgid "Back"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:633
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:630
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:254
msgid "Banner"
msgstr ""
@@ -467,7 +467,7 @@ msgstr ""
msgid "Bleach Versus Crusade"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:637
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:634
msgid "Blocks"
msgstr ""
@@ -583,7 +583,7 @@ msgstr ""
msgid "Choose a default ISO:"
msgstr ""
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1127
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1126
msgid "Choose a directory to add"
msgstr ""
@@ -645,7 +645,7 @@ msgstr ""
msgid "Command"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:635
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
msgid "Comment"
msgstr ""
@@ -743,7 +743,7 @@ msgstr ""
msgid "Connected to %i Wiimotes"
msgstr ""
#: Source/Core/DolphinWX/Src/Main.cpp:607
#: Source/Core/DolphinWX/Src/Main.cpp:605
msgid "Connecting..."
msgstr ""
@@ -763,7 +763,7 @@ msgstr ""
msgid "Copy"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:794
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:791
#, c-format
msgid "Copy to Memcard %c"
msgstr ""
@@ -876,8 +876,8 @@ msgstr ""
msgid "Date:"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:535
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:569
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:568
msgid "Datel MaxDrive/Pro files(*.sav)"
msgstr ""
@@ -919,7 +919,7 @@ msgstr ""
msgid "Delete"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
msgid "Delete Save"
msgstr ""
@@ -1259,7 +1259,7 @@ msgid ""
"Compatible)"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805
msgid "Enable pages"
msgstr ""
@@ -1343,7 +1343,7 @@ msgstr ""
msgid "Equal"
msgstr ""
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1133
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1132
#: Source/Core/DolphinWX/Src/LogWindow.cpp:76
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:143
msgid "Error"
@@ -1373,7 +1373,7 @@ msgstr ""
msgid "Export Recording..."
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:794
msgid "Export Save"
msgstr ""
@@ -1381,11 +1381,11 @@ msgstr ""
msgid "Export Wii save (Experimental)"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:798
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795
msgid "Export all saves"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:564
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:563
msgid "Export save as..."
msgstr ""
@@ -1496,11 +1496,11 @@ msgstr ""
msgid "Filetype 'ini' is unknown! Will not open!"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:638
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:635
msgid "First Block"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:801
msgid "Fix Checksums"
msgstr ""
@@ -1570,7 +1570,7 @@ msgid ""
"work properly, but it can also be very slow."
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:541
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:540
msgid "GCI File(*.gci)"
msgstr ""
@@ -1726,7 +1726,7 @@ msgstr ""
msgid "ITALY"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:636
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:633
msgid "Icon"
msgstr ""
@@ -1742,7 +1742,7 @@ msgid ""
"you also have to disable Audio Throttle in DSP to make it effective."
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
msgid "Import Save"
msgstr ""
@@ -1993,8 +1993,8 @@ msgstr ""
msgid "MMU Speed Hack"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:534
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:568
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:533
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:567
msgid "MadCatz Gameshark files(*.gcs)"
msgstr ""
@@ -2150,8 +2150,8 @@ msgstr ""
msgid "Name: "
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:533
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:567
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:532
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:566
msgid "Native GCI files(*.gci)"
msgstr ""
@@ -2164,7 +2164,7 @@ msgid "New Scan"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:207
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:806
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:803
msgid "Next Page"
msgstr ""
@@ -2215,7 +2215,7 @@ msgstr ""
msgid "Not Set"
msgstr ""
#: Source/Core/DolphinWX/Src/Main.cpp:606
#: Source/Core/DolphinWX/Src/Main.cpp:604
msgid "Not connected"
msgstr ""
@@ -2427,7 +2427,7 @@ msgstr ""
msgid "Prev Page"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
msgid "Previous Page"
msgstr ""
@@ -2589,7 +2589,7 @@ msgstr ""
msgid "Save"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:539
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:538
msgid "Save GCI as..."
msgstr ""
@@ -2658,7 +2658,7 @@ msgid ""
"When in doubt, use the first one"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:528
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:527
msgid "Select a save file to import"
msgstr ""
@@ -2737,7 +2737,7 @@ msgstr ""
msgid "Set as &default ISO"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:807
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:804
#, c-format
msgid "Set as default Memcard %c"
msgstr ""
@@ -2844,23 +2844,23 @@ msgid ""
"This is only useful for debugging purposes."
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:813
msgid "Show save banner"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:820
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:817
msgid "Show save blocks"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:818
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:815
msgid "Show save comment"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:819
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:816
msgid "Show save icon"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:817
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:814
msgid "Show save title"
msgstr ""
@@ -3032,11 +3032,11 @@ msgstr ""
msgid "Texture Format"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:517
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:516
msgid "The checksum was successfully fixed"
msgstr ""
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1133
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1132
msgid "The chosen directory is already in the list"
msgstr ""
@@ -3123,7 +3123,7 @@ msgstr ""
msgid "This will let you Manually Edit the INI config file"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:634
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:631
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:255
msgid "Title"
msgstr ""
@@ -3272,7 +3272,7 @@ msgstr ""
msgid "Warning"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:590
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:589
#, c-format
msgid ""
"Warning: This will overwrite any existing saves that are in the folder:\n"
@@ -3327,7 +3327,7 @@ msgid ""
"Do you want to reconnect immediately?"
msgstr ""
#: Source/Core/DolphinWX/Src/Main.cpp:608
#: Source/Core/DolphinWX/Src/Main.cpp:606
msgid "Wiimote Connected"
msgstr ""