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/es.po
+319
View File
@@ -7,8 +7,13 @@ msgid ""
msgstr ""
"Project-Id-Version: Dolphin Emu\n"
"Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
"PO-Revision-Date: 2011-12-09 00:28+0100\n"
=======
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
"PO-Revision-Date: 2011-08-11 15:30+0100\n"
>>>>>>> Update translation files for recent changes in the code.
"Last-Translator: Petiso Carambanal <[email protected]>\n"
"Language-Team: DARIO_FF <[email protected]>\n"
"Language: Spanish\n"
@@ -431,6 +436,10 @@ msgid "Accurate VBeam emulation"
msgstr "Emulación de VBeam Precisa"
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:97
<<<<<<< HEAD
=======
#, fuzzy
>>>>>>> Update translation files for recent changes in the code.
msgid ""
"Accurately emulate EFB copies.\n"
"Some games depend on this for certain graphical effects or gameplay "
@@ -559,9 +568,15 @@ msgstr "Añadir Parche"
msgid "Add new pane"
msgstr "Añadir nueva ventana"
<<<<<<< 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 "Añadir..."
@@ -630,8 +645,13 @@ msgstr "Todas las imágenes GC/Wii (gcm, iso, ciso, gcz)"
msgid "All Gamecube GCM files (gcm)"
msgstr "Todos los archivos Gamecube GCM (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 "Todos los estados guardados (sav, s##)"
@@ -660,8 +680,14 @@ msgstr ""
"Si está inseguro, déjelo sin marcar."
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:324
<<<<<<< HEAD
msgid "Alternate Wiimote Timing"
msgstr "Sincronización alternativa del Wiimote"
=======
#, fuzzy
msgid "Alternate Wiimote Timing"
msgstr "Wiimote emulado"
>>>>>>> Update translation files for recent changes in the code.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:372
msgid "Anisotropic Filtering:"
@@ -718,7 +744,11 @@ msgstr ""
msgid "Are you sure you want to delete this file? It will be gone forever!"
msgstr "¿Seguro que quiere borrar este archivo? ¡Desaparecerá para siempre!"
<<<<<<< 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 "Relación de aspecto:"
@@ -739,7 +769,11 @@ msgstr "Motor de Audio:"
msgid "AudioCommon: Error opening AO device.\n"
msgstr "AudioCommon: Error al abrir dispositivo AO.\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 "Automático"
@@ -855,7 +889,11 @@ msgid "Blue Right"
msgstr "Azul derecha"
#: 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 "Inferior"
@@ -888,7 +926,11 @@ msgstr "Busca un directorio de salida"
msgid "Buffer:"
msgstr "Búfer"
<<<<<<< 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"
@@ -1095,7 +1137,11 @@ msgstr "Escoge un archivo a abrir"
msgid "Choose a memory card:"
msgstr "Escoge una tarjeta de memoria:"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755
>>>>>>> Update translation files for recent changes in the code.
msgid ""
"Choose file to use as apploader: (applies to discs constructed from "
"directories only)"
@@ -1137,7 +1183,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 "Cerrar"
@@ -1246,7 +1296,11 @@ msgstr "Conectar Wiimote 3"
msgid "Connect Wiimote 4"
msgstr "Conectar 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 "Conectando..."
@@ -1364,7 +1418,11 @@ msgstr "Crear nueva perspectiva"
msgid "Created by KDE-Look.org"
msgstr "Creado por KDE-Look.org"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
>>>>>>> Update translation files for recent changes in the code.
msgid ""
"Created by Milosz Wlazlo [[email protected], miloszwl.deviantart.com]"
msgstr ""
@@ -1438,7 +1496,11 @@ msgid "DSP Emulator Engine"
msgstr "Motor de emulación DSP"
#: 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 "Emulación DSP HLE (rápido)"
@@ -1669,7 +1731,11 @@ msgstr ""
msgid "Divide"
msgstr "Dividir"
<<<<<<< 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 "¿Quieres detener la emulación actual?"
@@ -1698,12 +1764,21 @@ msgstr "Configuración de wiimote emulado de Dolphin"
msgid "Dolphin FIFO"
msgstr "Dolphin FIFO"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
msgid "Dolphin GCPad Configuration"
msgstr "Configuración de GCPad Dolphin"
#: 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 "Configuración de GCPad Dolphin"
#: 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 "Películas TAS de Dolphin (*.dtm)"
@@ -1715,7 +1790,11 @@ msgstr "Configuración de wiimote de Dolphin"
msgid "Dolphin at &Google Code"
msgstr "Dolphin en &Google Code"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339
=======
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
>>>>>>> Update translation files for recent changes in the code.
msgid ""
"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for "
"files..."
@@ -1723,7 +1802,11 @@ msgstr ""
"Dolphin no pudo encontrar ninguna ISO de GC/Wii. Haz doble clic aquí para "
"buscar..."
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343
=======
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307
>>>>>>> Update translation files for recent changes in the code.
msgid ""
"Dolphin is currently set to hide all games. Doubleclick here to show all "
"games..."
@@ -1799,9 +1882,15 @@ msgstr ""
"\n"
"Si está inseguro, déjelo sin marcar."
<<<<<<< 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.
msgid "Dutch"
msgstr "Holandés"
@@ -1940,15 +2029,22 @@ msgstr "Habilitar BAT"
msgid "Enable Block Merging"
msgstr "Habilitar asociación de bloques"
<<<<<<< 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
msgid "Enable Cache"
msgstr "Habilitar caché"
<<<<<<< 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 "Habilitar trucos"
@@ -2048,7 +2144,11 @@ msgstr ""
"\n"
"Si está inseguro, déjelo sin marcar."
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
>>>>>>> Update translation files for recent changes in the code.
msgid ""
"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
"ANY other game."
@@ -2103,9 +2203,15 @@ msgstr ""
msgid "End"
msgstr "Fin"
<<<<<<< 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.
msgid "English"
msgstr "Inglés"
@@ -2134,6 +2240,7 @@ msgstr "Igual"
#: 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 "Error"
@@ -2145,6 +2252,12 @@ msgid ""
"Sorry, Wii recording is temporarily broken."
msgstr ""
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
msgid "Error"
msgstr "Error"
>>>>>>> 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 ""
@@ -2153,6 +2266,7 @@ msgstr ""
#: Source/Core/Common/Src/ChunkFile.h:180
#, c-format
msgid ""
<<<<<<< HEAD
"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
"Aborting savestate load..."
msgstr ""
@@ -2160,6 +2274,8 @@ msgstr ""
#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279
#, c-format
msgid ""
=======
>>>>>>> Update translation files for recent changes in the code.
"Error: Trying to access %s fonts but they are not loaded. Games may not show "
"fonts correctly, or crash."
msgstr ""
@@ -2603,9 +2719,15 @@ msgstr "Frames a grabar"
msgid "Free Look"
msgstr "Cámara libre"
<<<<<<< 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.
msgid "French"
msgstr "Francés"
@@ -2672,7 +2794,11 @@ msgid "Gamecube &Pad Settings"
msgstr "&Configuración del mando 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 "Tarjetas de memoria de Gamecube (*.raw,*.gcp)"
@@ -2695,8 +2821,12 @@ msgstr ""
"(puede ser un código incorrecto o su tipo no es soportado todavía.)"
#: 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 "General"
@@ -2705,9 +2835,15 @@ msgstr "General"
msgid "General Settings"
msgstr "Ajustes generales"
<<<<<<< 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.
msgid "German"
msgstr "Alemán"
@@ -2730,6 +2866,10 @@ msgid "Greater Than"
msgstr "Mayor que"
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:87
<<<<<<< HEAD
=======
#, fuzzy
>>>>>>> Update translation files for recent changes in the code.
msgid ""
"Greatly increases quality of textures generated using render to texture "
"effects.\n"
@@ -2739,10 +2879,17 @@ msgid ""
"\n"
"If unsure, leave this checked."
msgstr ""
<<<<<<< HEAD
"Mejora bastante la calidad de las texturas generadas usando los efectos de "
"renderización para la textura.\n"
"Aumentar la resolución interna va a mejorar el efecto de este ajuste.\n"
"Reduce ligeramente el desempeño y posiblemente cause fallos (altamente "
=======
"Aumenta bastante la calidad de las texturas generadas utilizando los efectos "
"de renderización para la textura.\n"
"Aumentar la resolución interna va a mejorar el efecto de esta definición.\n"
"Diminuye ligeramente el desempenño y probablemente provoca fallos (aunque es "
>>>>>>> Update translation files for recent changes in the code.
"improbable).\n"
"\n"
"Si está inseguro, déjelo marcado."
@@ -2840,8 +2987,12 @@ msgid "Hotkey Configuration"
msgstr "Configuración de atajos"
#: 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 "Atajos"
@@ -2922,7 +3073,11 @@ msgstr ""
"Si los FPS son erróneos, esta opción puede ayudar. (ON = Compatible, OFF = "
"Rápido)"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481
>>>>>>> Update translation files for recent changes in the code.
msgid ""
"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you "
"also have to disable Audio Throttle in DSP to make it effective."
@@ -3066,7 +3221,11 @@ msgstr ""
"Se ha llamado InstallExceptionHandler, pero esta plataforma no lo soporta "
"todavía."
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
>>>>>>> Update translation files for recent changes in the code.
msgid "Installing WAD..."
msgstr "Instalando WAD..."
@@ -3148,9 +3307,15 @@ msgstr "Archivo de grabación no válido"
msgid "Invalid state"
msgstr "Estado no válido"
<<<<<<< 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.
msgid "Italian"
msgstr "Italiano"
@@ -3308,11 +3473,19 @@ msgstr "&Cargar estado 8"
msgid "Load State..."
msgstr "Cargar estado..."
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
msgid "Load Wii System Menu"
msgstr "Cargar Menú de sistema Wii"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
msgid "Load Wii System Menu"
msgstr "Cargar Menú de sistema Wii"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
>>>>>>> Update translation files for recent changes in the code.
#, c-format
msgid "Load Wii System Menu %d%c"
msgstr "Cargar Menú de sistema Wii %d %c"
@@ -3394,7 +3567,11 @@ msgstr "Hack de velocidad MMU"
msgid "MadCatz Gameshark files(*.gcs)"
msgstr "Archivos MadCatz Gameshark (*.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 "Stick principal"
@@ -3425,7 +3602,11 @@ msgid "Memory Byte"
msgstr "Byte de memoria"
#: 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 "Tarjeta de memoria"
@@ -3523,9 +3704,12 @@ msgid ""
msgstr ""
"Mueva el puntero del ratón sobre una opción para obtener una descripción "
"detallada.\n"
<<<<<<< HEAD
"\n"
"\n"
"\n"
=======
>>>>>>> Update translation files for recent changes in the code.
"\n"
"\n"
"\n"
@@ -3626,7 +3810,11 @@ msgstr "NP Tab"
msgid "NP Up"
msgstr "NP Arriba"
<<<<<<< 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:"
@@ -3713,7 +3901,11 @@ msgstr "No Igual"
msgid "Not Set"
msgstr "No Definido"
<<<<<<< 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 "Sin conectar"
@@ -3774,7 +3966,10 @@ msgstr "Solo %d bloques disponibles"
#: 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 "Abrir"
@@ -3906,8 +4101,13 @@ msgstr "Parches"
msgid "Paths"
msgstr "Directorios"
<<<<<<< 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 "Pausa"
@@ -3927,8 +4127,13 @@ msgstr "Perspectiva %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 "Reproducir"
@@ -3954,7 +4159,11 @@ msgstr "Opciones de reproducción"
msgid "Players"
msgstr "Jugadores"
<<<<<<< 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 "Confirme, por favor..."
@@ -4165,10 +4374,17 @@ msgstr "Actualizar lista"
msgid "Refresh game list"
msgstr "Actualizar lista de juegos"
<<<<<<< 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 "Eliminar"
@@ -4187,7 +4403,10 @@ msgid "Render to Main Window"
msgstr "Renderizar a ventana principal"
#: 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 "Reiniciar"
@@ -4230,7 +4449,11 @@ msgstr "Guardar estado"
msgid "Safe"
msgstr "Seguro"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
>>>>>>> Update translation files for recent changes in the code.
msgid "Sample Rate:"
msgstr "Frecuencia del sonido:"
@@ -4356,12 +4579,21 @@ msgstr "No se ha encontrado la sección %s en SYSCONF"
msgid "Select"
msgstr "Seleccionar"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
msgid "Select The Recording File"
msgstr "Seleccionar archivo de grabación"
#: 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 "Seleccionar archivo de grabación"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
>>>>>>> Update translation files for recent changes in the code.
msgid "Select a Wii WAD file to install"
msgstr "Elige un WAD de Wii para instalar"
@@ -4387,6 +4619,7 @@ msgstr "Selecciona las ventanas flotantes"
msgid "Select the file to load"
msgstr "Selecciona el archivo para cargar"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
msgid "Select the save file"
msgstr "Selecciona el archivo de guardado"
@@ -4396,6 +4629,17 @@ msgid "Select the state to load"
msgstr "Selecciona el estado para cargar"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
msgid "Select the save file"
msgstr "Selecciona el archivo de guardado"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
msgid "Select the state to load"
msgstr "Selecciona el estado para cargar"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
>>>>>>> Update translation files for recent changes in the code.
msgid "Select the state to save"
msgstr "Selecciona el estado para guardar"
@@ -4470,7 +4714,11 @@ msgstr "Separador"
msgid "Serbian"
msgstr "Serbio"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
>>>>>>> Update translation files for recent changes in the code.
msgid ""
"Serial Port 1 - This is the port which devices such as the net adapter use"
msgstr ""
@@ -4699,6 +4947,7 @@ msgid "Skip EFB Access from CPU"
msgstr "Saltar el acceso al EFB desde la CPU"
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:103
<<<<<<< HEAD
msgid ""
"Skip the destination alpha pass used in many games for various graphical "
"effects.\n"
@@ -4719,6 +4968,28 @@ msgid ""
"\n"
"If unsure, leave this unchecked."
msgstr ""
=======
msgid ""
"Skip the destination alpha pass used in many games for various graphical "
"effects.\n"
"\n"
"If unsure, leave this unchecked."
msgstr ""
"Salta el destino del pase alfa usado en muchos juegos para varios efectos "
"gráficos.\n"
"\n"
"Si está inseguro, déjelo sin marcar."
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:126
msgid ""
"Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\n"
"Sometimes also increases visual quality.\n"
"If you're experiencing any issues, try raising texture cache accuracy or "
"disable this option.\n"
"\n"
"If unsure, leave this unchecked."
msgstr ""
>>>>>>> Update translation files for recent changes in the code.
"Aumenta ligeramente las copias de EFB a la RAM al sacrificar exactitud de "
"emulación.\n"
"A veces también aumenta la calidad visual.\n"
@@ -4779,9 +5050,15 @@ msgstr "Falló la creación del búfer de sonido: %s"
msgid "Space"
msgstr "Espacio"
<<<<<<< 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.
msgid "Spanish"
msgstr "Español"
@@ -4825,7 +5102,11 @@ msgstr "Stick cuadrado"
msgid "Standard Controller"
msgstr "Control estándar"
<<<<<<< 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"
@@ -4860,7 +5141,10 @@ msgstr "Stick"
#: 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 "Detener"
@@ -4940,7 +5224,10 @@ msgstr "Tabla derecha"
#: 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 "Captura de pantalla"
@@ -5191,12 +5478,19 @@ msgstr "Alternar todos los tipos de registro"
#: 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 "Cambiar a pantalla completa"
#: 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 "Superior"
@@ -5303,6 +5597,17 @@ msgstr "Se recibió un mensaje desconocido de id: %d"
#: Source/Core/Core/Src/NetPlayServer.cpp:504
#, c-format
msgid "Unknown message with id:%d received from player:%d Kicking player!"
<<<<<<< HEAD
=======
msgstr ""
"Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!"
#: Source/Core/Core/Src/HW/Memmap.cpp:633
#, c-format
msgid ""
"Unknown pointer %#08x\n"
"Continue?"
>>>>>>> Update translation files for recent changes in the code.
msgstr ""
"Mensaje desconocido con id:%d recibido del jugador:%d ¡Echando al jugador!"
@@ -5532,7 +5837,11 @@ msgstr "Raíz de la NAND de Wii:"
msgid "Wii Save Import"
msgstr "Importar guardado de 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 "Archivos de guardado Wii (*.bin)|*.bin"
@@ -5563,7 +5872,11 @@ msgstr ""
"o mucho tiempo de espera, o alguna otra razón.\n"
"¿Desea reconectarlo inmediatamente?"
<<<<<<< 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 conectado"
@@ -5595,9 +5908,15 @@ msgstr "Windows Derecha"
msgid "Word Wrap"
msgstr "Word Wrap"
<<<<<<< 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 "Trabajando..."