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/ru.po
+41 -41
View File
@@ -7,7 +7,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: 2011-01-07 20:57+0300\n"
"Last-Translator: Kein <[email protected]>\n"
"Language-Team: \n"
@@ -52,7 +52,7 @@ msgstr "%1$sКопировать%1$s"
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 "%d свободных блоков; %d свободных записей каталогов"
@@ -458,7 +458,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 "Логотип"
@@ -483,7 +483,7 @@ msgstr "Основные настройки"
msgid "Bleach Versus Crusade"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:637
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:634
msgid "Blocks"
msgstr ""
@@ -602,7 +602,7 @@ msgstr "Выберите основной DVD-диск:"
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 "Выберите папку для добавления в список"
@@ -664,7 +664,7 @@ msgstr ""
msgid "Command"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:635
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:632
msgid "Comment"
msgstr "Комментарий"
@@ -762,7 +762,7 @@ msgstr "Подключено"
msgid "Connected to %i Wiimotes"
msgstr "Подключен к %i Wiimotes"
#: Source/Core/DolphinWX/Src/Main.cpp:607
#: Source/Core/DolphinWX/Src/Main.cpp:605
msgid "Connecting..."
msgstr "Подключение..."
@@ -782,7 +782,7 @@ msgstr "Конвертировать в GCI"
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 ""
@@ -897,8 +897,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 "Файлы Datel MaxDrive/Pro (*.sav)"
@@ -940,7 +940,7 @@ msgstr "Шрифт по умолчанию"
msgid "Delete"
msgstr "Удалить"
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:795
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:792
msgid "Delete Save"
msgstr ""
@@ -1284,7 +1284,7 @@ msgstr ""
"Активирует режим быстрого доступ к диску, необходим для некоторых игр "
"(отключите для повышения совместимости)."
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:808
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805
msgid "Enable pages"
msgstr ""
@@ -1374,7 +1374,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"
@@ -1405,7 +1405,7 @@ msgstr "Экспортирование файла"
msgid "Export Recording..."
msgstr "&Экспортировать запись процесса"
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:797
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:794
msgid "Export Save"
msgstr ""
@@ -1413,11 +1413,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 "&Экспортировать сохранение как..."
@@ -1528,11 +1528,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 ""
@@ -1602,7 +1602,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 ""
@@ -1760,7 +1760,7 @@ msgstr "Папки с файлами образов"
msgid "ITALY"
msgstr ""
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:636
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:633
msgid "Icon"
msgstr ""
@@ -1783,7 +1783,7 @@ msgstr ""
"Throttle\n"
"в опциях аудиоплагина."
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:796
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:793
msgid "Import Save"
msgstr ""
@@ -2034,8 +2034,8 @@ msgstr ""
msgid "MMU Speed Hack"
msgstr "Ускорить MMU (спидхак)"
#: 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 "Файлы Gameshark MadCatz (*.gcs)"
@@ -2191,8 +2191,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 "Стандартные CGI-файлы (*.gci)"
@@ -2205,7 +2205,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 "След. страница"
@@ -2256,7 +2256,7 @@ msgstr "Не равно"
msgid "Not Set"
msgstr "Неизвестно"
#: Source/Core/DolphinWX/Src/Main.cpp:606
#: Source/Core/DolphinWX/Src/Main.cpp:604
msgid "Not connected"
msgstr "Не подключено"
@@ -2468,7 +2468,7 @@ msgstr ""
msgid "Prev Page"
msgstr "Пред. страница"
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:805
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:802
msgid "Previous Page"
msgstr ""
@@ -2632,7 +2632,7 @@ msgstr "Частота"
msgid "Save"
msgstr "Сохранить"
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:539
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:538
msgid "Save GCI as..."
msgstr "Сохранить CGI-файл как..."
@@ -2701,7 +2701,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 ""
@@ -2784,7 +2784,7 @@ msgstr "Установить регион консоли как NTSC-J"
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 "Установить картой памяти по умолчанию %c"
@@ -2896,23 +2896,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 ""
@@ -3084,11 +3084,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 ""
@@ -3195,7 +3195,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 "Название"
@@ -3344,7 +3344,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"
@@ -3399,7 +3399,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 "Wiimote подключен"