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

Update translation files for recent changes in the code.

Browse Source
This commit is contained in:
Glenn Rice
2012-03-09 17:46:09 -06:00
parent b69a1d225a
commit 61d5624c2d
24 changed files with 6302 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Languages/po/ru.po
+245
View File
@@ -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 <[email protected]>\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 "Подождите..."