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

Update from master branch.

Browse Source 
Update Arabic, Hungarian, and Spanish translations.
This commit is contained in:
Glenn Rice
2012-03-09 17:46:28 -06:00
parent 6961c2e553
commit 7306257c0f
23 changed files with 7012 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Languages/po/pt_BR.po
+289 -1
View File
@@ -8,12 +8,17 @@ msgstr ""
"Project-Id-Version: Dolphin Emu\n"
"Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
<<<<<<< HEAD
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
"PO-Revision-Date: 2011-12-18 13:38-0600\n"
=======
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
"PO-Revision-Date: 2011-09-11 23:35-0300\n"
>>>>>>> Update translation files for recent changes in the code.
=======
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
"PO-Revision-Date: 2011-12-18 13:38-0600\n"
>>>>>>> Update from master branch.
"Last-Translator: Runo <[email protected]>\n"
"Language-Team: Portuguese (BR) <[email protected]>\n"
"Language: \n"
@@ -563,6 +568,7 @@ msgstr "Adicionar Patch"
msgid "Add new pane"
msgstr "Adicionar novo painél"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
@@ -572,6 +578,11 @@ msgstr "Adicionar novo painél"
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
>>>>>>> Update from master branch.
msgid "Add..."
msgstr "Adicionar..."
@@ -639,6 +650,7 @@ msgstr "Todas as imagens CG/Wii (gcm, iso, ciso, gcz)"
msgid "All Gamecube GCM files (gcm)"
msgstr "Todos os arquivos Gamecube CGM (gcm)"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
@@ -646,6 +658,10 @@ msgstr "Todos os arquivos Gamecube CGM (gcm)"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
>>>>>>> Update from master branch.
msgid "All Save States (sav, s##)"
msgstr "Todos os Pontos de Jogo Salvos (sav, s##)"
@@ -735,11 +751,15 @@ msgstr ""
"Você tem certeza que quer deletar este arquivo? Ele ficará perdido para "
"sempre!"
<<<<<<< HEAD
<<<<<<< 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/ConfigMain.cpp:729
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
msgid "Aspect Ratio:"
msgstr "Proporção:"
@@ -760,11 +780,15 @@ msgstr "Backend de Audio"
msgid "AudioCommon: Error opening AO device.\n"
msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n"
<<<<<<< HEAD
<<<<<<< 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/ConfigMain.cpp:239
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
msgid "Auto"
msgstr "Automático"
@@ -881,10 +905,14 @@ msgstr "Azul Direito"
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
>>>>>>> Update from master branch.
msgid "Bottom"
msgstr "Embaixo"
@@ -917,11 +945,15 @@ msgstr "Procurar por um diretório de saída"
msgid "Buffer:"
msgstr "Buffer:"
<<<<<<< HEAD
<<<<<<< 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/Core/Src/HW/GCPadEmu.cpp:71
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
msgid "Buttons"
@@ -1126,11 +1158,15 @@ msgstr "Escolher um arquivo para abrir"
msgid "Choose a memory card:"
msgstr "Escolher um cartão de memória:"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759
>>>>>>> Update from master branch.
msgid ""
"Choose file to use as apploader: (applies to discs constructed from "
"directories only)"
@@ -1173,10 +1209,14 @@ msgstr ""
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
<<<<<<< HEAD
<<<<<<< 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/ISOProperties.cpp:563
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
msgid "Close"
msgstr "Fechar"
@@ -1285,11 +1325,15 @@ msgstr "Conectar Wiimote 3"
msgid "Connect Wiimote 4"
msgstr "Conectar Wiimote 4"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/Main.cpp:597
=======
#: Source/Core/DolphinWX/Src/Main.cpp:598
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/Main.cpp:597
>>>>>>> Update from master branch.
msgid "Connecting..."
msgstr "Conectando..."
@@ -1406,11 +1450,15 @@ msgstr "Criar nova perspectiva"
msgid "Created by KDE-Look.org"
msgstr "Criado por KDE-Look.org"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
>>>>>>> Update from master branch.
msgid ""
"Created by Milosz Wlazlo [[email protected], miloszwl.deviantart.com]"
msgstr ""
@@ -1485,10 +1533,14 @@ msgstr "Engine de Emulação do DSP"
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
>>>>>>> Update from master branch.
msgid "DSP HLE emulation (fast)"
msgstr "Emulação HLE do DSP (rápido)"
@@ -1719,11 +1771,15 @@ msgstr ""
msgid "Divide"
msgstr "Dividir"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
>>>>>>> Update from master branch.
msgid "Do you want to stop the current emulation?"
msgstr "Você quer parar a emulação atual?"
@@ -1752,6 +1808,7 @@ msgstr "Configuração de Wiimote Emulado do Dolphin"
msgid "Dolphin FIFO"
msgstr "Dolphin FIFO"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
msgid "Dolphin GCPad Configuration"
@@ -1767,6 +1824,14 @@ msgstr "Configuração do GCPad do Dolphin"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
msgid "Dolphin GCPad Configuration"
msgstr "Configuração do GCPad do Dolphin"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
>>>>>>> Update from master branch.
msgid "Dolphin TAS Movies (*.dtm)"
msgstr "Filmes TAS Dolphin (*.dtm)"
@@ -1778,11 +1843,15 @@ msgstr "Configuração de Wiimote Dolphin"
msgid "Dolphin at &Google Code"
msgstr "Dolphin no &Google Code"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339
=======
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339
>>>>>>> Update from master branch.
msgid ""
"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for "
"files..."
@@ -1790,11 +1859,15 @@ msgstr ""
"Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por "
"arquivos..."
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343
=======
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343
>>>>>>> Update from master branch.
msgid ""
"Dolphin is currently set to hide all games. Doubleclick here to show all "
"games..."
@@ -1870,6 +1943,7 @@ msgstr ""
"\n"
"Se estiver em dúvida, deixe isto desativado."
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
@@ -1879,6 +1953,11 @@ msgstr ""
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
>>>>>>> Update from master branch.
msgid "Dutch"
msgstr "Holandês"
@@ -2023,21 +2102,31 @@ msgid "Enable Block Merging"
msgstr "Ativar Block Merging"
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
msgid "Enable Bounding Box Calculation"
msgstr ""
<<<<<<< HEAD
=======
>>>>>>> Update translation files for recent changes in the code.
=======
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
msgid "Enable Cache"
msgstr "Ativar Cache"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
>>>>>>> Update from master branch.
msgid "Enable Cheats"
msgstr "Ativar Cheats"
@@ -2137,11 +2226,15 @@ msgstr ""
"\n"
"Se estiver em dúvida, deixe isto desativado."
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
>>>>>>> Update from master branch.
msgid ""
"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
"ANY other game."
@@ -2197,6 +2290,7 @@ msgstr ""
msgid "End"
msgstr "Fim"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
@@ -2206,6 +2300,11 @@ msgstr "Fim"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
>>>>>>> Update from master branch.
msgid "English"
msgstr "Inglês"
@@ -2235,6 +2334,7 @@ msgstr "Igual"
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
msgid "Error"
msgstr "Erro"
@@ -2252,11 +2352,34 @@ msgid "Error"
msgstr "Erro"
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
msgid "Error"
msgstr "Erro"
#: Source/Core/Core/Src/Movie.cpp:820
#, c-format
msgid ""
"Error in PlayWiimote. %u != %u, byte %d.\n"
"Sorry, Wii recording is temporarily broken."
msgstr ""
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/Main.cpp:346
msgid "Error loading selected language. Falling back to system default."
msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema."
#: Source/Core/Common/Src/ChunkFile.h:180
<<<<<<< HEAD
=======
#, c-format
msgid ""
"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
"Aborting savestate load..."
msgstr ""
#: Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp:279
>>>>>>> Update from master branch.
#, c-format
msgid ""
<<<<<<< HEAD
@@ -2711,6 +2834,7 @@ msgstr "QUadros para Capturar"
msgid "Free Look"
msgstr "Olhar Livre"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
@@ -2720,6 +2844,11 @@ msgstr "Olhar Livre"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
>>>>>>> Update from master branch.
msgid "French"
msgstr "Francês"
@@ -2787,10 +2916,14 @@ msgstr "Configurações de &Controle de Gamecube"
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
>>>>>>> Update from master branch.
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
msgstr "Memory Cards do Gamecube (*.raw,*.gcp)"
@@ -2814,11 +2947,16 @@ msgstr ""
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
<<<<<<< HEAD
<<<<<<< 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/GCMicDlg.cpp:176
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
msgid "General"
msgstr "Geral"
@@ -2827,6 +2965,7 @@ msgstr "Geral"
msgid "General Settings"
msgstr "Configurações Gerais"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
@@ -2836,6 +2975,11 @@ msgstr "Configurações Gerais"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
>>>>>>> Update from master branch.
msgid "German"
msgstr "Alemão"
@@ -2967,11 +3111,16 @@ msgstr "Configuração de hotkey"
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
<<<<<<< HEAD
<<<<<<< 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.
=======
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
>>>>>>> Update from master branch.
msgid "Hotkeys"
msgstr "Hotkeys"
@@ -3051,11 +3200,15 @@ msgstr ""
"Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = Compatível, "
"OFF = Rápido)"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
>>>>>>> Update from master branch.
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."
@@ -3199,11 +3352,15 @@ msgstr ""
"InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem "
"suporte a ele."
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
>>>>>>> Update from master branch.
msgid "Installing WAD..."
msgstr "Instalando WAD..."
@@ -3285,6 +3442,7 @@ msgstr "Arquivo de gravação inválido"
msgid "Invalid state"
msgstr "Estado Salvo Inválido"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
@@ -3294,6 +3452,11 @@ msgstr "Estado Salvo Inválido"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
>>>>>>> Update from master branch.
msgid "Italian"
msgstr "Italiano"
@@ -3451,6 +3614,7 @@ msgstr "Carregar Estado do Slot 8"
msgid "Load State..."
msgstr "Carregar State..."
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
msgid "Load Wii System Menu"
@@ -3464,6 +3628,13 @@ msgstr "Carregar Menu de Sistema do Wii"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
msgid "Load Wii System Menu"
msgstr "Carregar Menu de Sistema do Wii"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
>>>>>>> Update from master branch.
#, c-format
msgid "Load Wii System Menu %d%c"
msgstr "Carregar Menu de Sistema do Wii %d %c"
@@ -3546,11 +3717,15 @@ msgstr "Hack de velocidade MMU"
msgid "MadCatz Gameshark files(*.gcs)"
msgstr "Arquivos de Gameshark MadCatz(*.gcs)"
<<<<<<< HEAD
<<<<<<< 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/Core/Src/HW/GCPadEmu.cpp:76
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
msgid "Main Stick"
msgstr "Analógico Principal"
@@ -3582,10 +3757,14 @@ msgstr "Byte de Memória"
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
>>>>>>> Update from master branch.
msgid "Memory Card"
msgstr "Cartão de memoria"
@@ -3784,11 +3963,15 @@ msgstr "NP Tab"
msgid "NP Up"
msgstr "NP Cima"
<<<<<<< HEAD
<<<<<<< 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/ISOProperties.cpp:455
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
msgid "Name:"
@@ -3875,11 +4058,15 @@ msgstr "Não igual"
msgid "Not Set"
msgstr "Indefinido"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/Main.cpp:596
=======
#: Source/Core/DolphinWX/Src/Main.cpp:597
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/Main.cpp:596
>>>>>>> Update from master branch.
msgid "Not connected"
msgstr "Não conectado"
@@ -3941,9 +4128,13 @@ msgstr "Apenas %d blocos disponíveis"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
=======
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
>>>>>>> Update from master branch.
msgid "Open"
msgstr "Abrir"
@@ -4074,6 +4265,7 @@ msgstr "Patches"
msgid "Paths"
msgstr "Diretórios"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
@@ -4081,6 +4273,10 @@ msgstr "Diretórios"
#: 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/FrameTools.cpp:1621
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
msgid "Pause"
msgstr "Pausar"
@@ -4101,12 +4297,17 @@ msgstr "Perspectiva %d"
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
<<<<<<< HEAD
<<<<<<< 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.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
>>>>>>> Update from master branch.
msgid "Play"
msgstr "Executar"
@@ -4132,11 +4333,15 @@ msgstr "Opções de Reprodução"
msgid "Players"
msgstr "Jogadores"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
>>>>>>> Update from master branch.
msgid "Please confirm..."
msgstr "Favor confirmar..."
@@ -4347,6 +4552,7 @@ msgstr "Atualizar Lista"
msgid "Refresh game list"
msgstr "Atualizar a lista de jogos"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
@@ -4358,6 +4564,12 @@ msgstr "Atualizar a lista de jogos"
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
>>>>>>> Update translation files for recent changes in the code.
=======
#: 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
>>>>>>> Update from master branch.
msgid "Remove"
msgstr "Remover"
@@ -4377,9 +4589,13 @@ msgstr "Renderizar na Janela Principal"
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
=======
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
msgid "Reset"
msgstr "Reiniciar"
@@ -4422,11 +4638,15 @@ msgstr "Sal&var estado atual"
msgid "Safe"
msgstr "Seguro"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
>>>>>>> Update from master branch.
msgid "Sample Rate:"
msgstr "Taxa de Amostragem:"
@@ -4510,11 +4730,15 @@ msgstr "O Estado Salvo capturado %s está corrompido, parando captura..."
msgid "Scaled EFB Copy"
msgstr "Cópia Escalada do EFB"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
=======
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
>>>>>>> Update from master branch.
#, c-format
msgid "Scanning %s"
msgstr "Escaneando %s"
@@ -4554,6 +4778,7 @@ msgstr "A seção %s não foi encontrada no SYSCONF"
msgid "Select"
msgstr "Selecionar"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
@@ -4569,6 +4794,14 @@ msgstr "Selecione o arquivo de Gravação"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
msgid "Select The Recording File"
msgstr "Selecione o arquivo de Gravação"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
>>>>>>> Update from master branch.
msgid "Select a Wii WAD file to install"
msgstr "Selecione um arquivo WAD de Wii para instalar"
@@ -4593,6 +4826,7 @@ msgstr "Selecionar Janelas flutuantes"
msgid "Select the file to load"
msgstr "Selecione um arquivo para carregar"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
msgid "Select the save file"
@@ -4605,15 +4839,22 @@ msgstr "Selecione um estado para carregar"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
>>>>>>> Update from master branch.
msgid "Select the save file"
msgstr "Selecione o arquivo de salva"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
msgid "Select the state to load"
msgstr "Selecione um estado para carregar"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
>>>>>>> Update from master branch.
msgid "Select the state to save"
msgstr "Selecione um estado para salvar"
@@ -4687,11 +4928,15 @@ msgstr "Separador"
msgid "Serbian"
msgstr "Sérvio"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
>>>>>>> Update from master branch.
msgid ""
"Serial Port 1 - This is the port which devices such as the net adapter use"
msgstr ""
@@ -4998,6 +5243,7 @@ msgstr "Falha na criação do buffer de som: %s"
msgid "Space"
msgstr "Barra de Espaço"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
@@ -5007,6 +5253,11 @@ msgstr "Barra de Espaço"
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
>>>>>>> Update from master branch.
msgid "Spanish"
msgstr "Espanhol"
@@ -5050,11 +5301,15 @@ msgstr "Analógico Quadrado"
msgid "Standard Controller"
msgstr "Controle Padrão"
<<<<<<< HEAD
<<<<<<< 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/Core/Src/HW/GCPadEmu.cpp:50
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
msgid "Start"
@@ -5090,9 +5345,13 @@ msgstr "Analógico"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
=======
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
msgid "Stop"
msgstr "Parar"
@@ -5170,9 +5429,13 @@ msgstr "Direita da Mesa"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
=======
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
>>>>>>> Update from master branch.
msgid "Take Screenshot"
msgstr "Capturar Tela"
@@ -5421,18 +5684,26 @@ msgstr "Ligar/Desligar Todos os Logs"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
=======
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
>>>>>>> Update from master branch.
msgid "Toggle Fullscreen"
msgstr "Ir para Tela Cheia"
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
>>>>>>> Update from master branch.
msgid "Top"
msgstr "Topo"
@@ -5545,6 +5816,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!"
msgstr ""
"Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!"
<<<<<<< HEAD
#: Source/Core/Core/Src/HW/Memmap.cpp:633
#, c-format
msgid ""
@@ -5554,6 +5826,8 @@ msgid ""
msgstr ""
"Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!"
=======
>>>>>>> Update from master branch.
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
msgid "Up"
@@ -5779,11 +6053,15 @@ msgstr "Raiz do Wii NAND"
msgid "Wii Save Import"
msgstr "Importar Save de Wii"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
>>>>>>> Update from master branch.
msgid "Wii save files (*.bin)|*.bin"
msgstr "Arquivos de Salva do Wii (*.bin)|*.bin"
@@ -5814,11 +6092,15 @@ msgstr ""
"ou talvez tenha sido pelo tempo parado ou por outra razão.\n"
"Você quer reconectar imediatamente?"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/Main.cpp:598
=======
#: Source/Core/DolphinWX/Src/Main.cpp:599
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/Main.cpp:598
>>>>>>> Update from master branch.
msgid "Wiimote Connected"
msgstr "Wiimote Conectado"
@@ -5850,6 +6132,7 @@ msgstr "Janelas da Direita"
msgid "Word Wrap"
msgstr "Word Wrap"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
@@ -5859,6 +6142,11 @@ msgstr "Word Wrap"
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
>>>>>>> Update from master branch.
msgid "Working..."
msgstr "Funcionando..."