Update from master branch.
Update Arabic, Hungarian, and Spanish translations.
This commit is contained in:
Glenn Rice
parent
6961c2e553
commit
7306257c0f
File diff suppressed because it is too large
Load Diff
|
|
@ -8,10 +8,14 @@ msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
=======
|
=======
|
||||||
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
"PO-Revision-Date: 2011-08-19 08:36-0500\n"
|
"PO-Revision-Date: 2011-08-19 08:36-0500\n"
|
||||||
"Last-Translator: Jordi Coma <jordicoma22@gmail.com>\n"
|
"Last-Translator: Jordi Coma <jordicoma22@gmail.com>\n"
|
||||||
"Language-Team: Catalan <jordicoma22@gmail.com>\n"
|
"Language-Team: Catalan <jordicoma22@gmail.com>\n"
|
||||||
|
|
@ -568,6 +572,7 @@ msgstr "Afegeix Pegat"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Afegeix un nou panell"
|
msgstr "Afegeix un nou panell"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
|
|
@ -577,6 +582,11 @@ msgstr "Afegeix un nou panell"
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Add..."
|
||||||
msgstr "Afegir ..."
|
msgstr "Afegir ..."
|
||||||
|
|
||||||
|
|
@ -644,6 +654,7 @@ msgstr "Totes les imatges GC / Wii (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Tots els fitxers GameCube GCM (gcm)"
|
msgstr "Tots els fitxers GameCube GCM (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
|
@ -651,6 +662,10 @@ msgstr "Tots els fitxers GameCube GCM (gcm)"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Tots els Estats (savi, s##\")"
|
msgstr "Tots els Estats (savi, s##\")"
|
||||||
|
|
||||||
|
|
@ -739,11 +754,15 @@ msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Estàs segur d'eliminar aquest fitxer? Aquesta acció serà irrecuperable!"
|
"Estàs segur d'eliminar aquest fitxer? Aquesta acció serà irrecuperable!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Relació d'aspecte:"
|
msgstr "Relació d'aspecte:"
|
||||||
|
|
@ -764,11 +783,15 @@ msgstr "Suport d'àudio:"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Error en obrir el dispositiu AO \n"
|
msgstr "AudioCommon: Error en obrir el dispositiu AO \n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Auto"
|
msgstr "Auto"
|
||||||
|
|
@ -885,10 +908,14 @@ msgstr "Blau dret"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Abaix"
|
msgstr "Abaix"
|
||||||
|
|
||||||
|
|
@ -921,11 +948,15 @@ msgstr "Examineu el directori de sortida"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Buffer:"
|
msgstr "Buffer:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1183,10 +1214,14 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Tancar"
|
msgstr "Tancar"
|
||||||
|
|
@ -1295,11 +1330,15 @@ msgstr "Connectar Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Connectar Wiimote 4"
|
msgstr "Connectar Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Connectant ..."
|
msgstr "Connectant ..."
|
||||||
|
|
||||||
|
|
@ -1491,10 +1530,14 @@ msgstr "Motor d'emulació DSP"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "Emulació DSP HLE (ràpid)"
|
msgstr "Emulació DSP HLE (ràpid)"
|
||||||
|
|
||||||
|
|
@ -1725,11 +1768,15 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Divideix"
|
msgstr "Divideix"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Voleu aturar l'emulació actual?"
|
msgstr "Voleu aturar l'emulació actual?"
|
||||||
|
|
||||||
|
|
@ -1758,6 +1805,7 @@ msgstr "Configuració de Wiimote emulat"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "FIFO Dolphin"
|
msgstr "FIFO Dolphin"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
|
@ -1773,6 +1821,14 @@ msgstr "Configuració del control GC Dolphin"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Configuració del control GC Dolphin"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Dolphin Pel·lícules TAS (*.dtm)"
|
msgstr "Dolphin Pel·lícules TAS (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1869,6 +1925,7 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Si no n'esteu segur, deixeu-ho desmarcat."
|
"Si no n'esteu segur, deixeu-ho desmarcat."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
|
|
@ -1878,6 +1935,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Dutch"
|
||||||
msgstr "Holandès"
|
msgstr "Holandès"
|
||||||
|
|
||||||
|
|
@ -2023,21 +2085,31 @@ msgid "Enable Block Merging"
|
||||||
msgstr "Habilitar fusió de Bloc"
|
msgstr "Habilitar fusió de Bloc"
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Habilitar memòria cau"
|
msgstr "Habilitar memòria cau"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Activar Trucs"
|
msgstr "Activar Trucs"
|
||||||
|
|
||||||
|
|
@ -2190,6 +2262,7 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Fi"
|
msgstr "Fi"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
|
@ -2199,6 +2272,11 @@ msgstr "Fi"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "English"
|
||||||
msgstr "Anglès"
|
msgstr "Anglès"
|
||||||
|
|
||||||
|
|
@ -2228,6 +2306,7 @@ msgstr "Igual"
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Error"
|
msgstr "Error"
|
||||||
|
|
@ -2245,6 +2324,19 @@ msgid "Error"
|
||||||
msgstr "Error"
|
msgstr "Error"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Error"
|
||||||
|
|
||||||
|
#: 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
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2703,6 +2795,7 @@ msgstr "Imatges a Enregistrar"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Visió lliure"
|
msgstr "Visió lliure"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
|
@ -2712,6 +2805,11 @@ msgstr "Visió lliure"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "French"
|
||||||
msgstr "Francès"
|
msgstr "Francès"
|
||||||
|
|
||||||
|
|
@ -2779,10 +2877,14 @@ msgstr "Configuració control «&Gamecube»"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)"
|
msgstr "Targetes de memòria per GameCube (*.raw, *.gcp)"
|
||||||
|
|
||||||
|
|
@ -2806,11 +2908,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "General"
|
msgstr "General"
|
||||||
|
|
@ -2819,6 +2926,7 @@ msgstr "General"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Configuració General"
|
msgstr "Configuració General"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
|
@ -2828,6 +2936,11 @@ msgstr "Configuració General"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "German"
|
||||||
msgstr "Alemany"
|
msgstr "Alemany"
|
||||||
|
|
||||||
|
|
@ -2962,11 +3075,16 @@ msgstr "Tecla d'accés de configuració"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Hotkeys"
|
||||||
msgstr "Tecles d'accés"
|
msgstr "Tecles d'accés"
|
||||||
|
|
||||||
|
|
@ -3191,11 +3309,15 @@ msgstr ""
|
||||||
"InstallExceptionHandler cridat, però aquesta plataforma no està suportada "
|
"InstallExceptionHandler cridat, però aquesta plataforma no està suportada "
|
||||||
"encara."
|
"encara."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "Instal·lant WAD ..."
|
msgstr "Instal·lant WAD ..."
|
||||||
|
|
||||||
|
|
@ -3277,6 +3399,7 @@ msgstr "Enregistrament de fitxer invàlid"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Estat invàlid"
|
msgstr "Estat invàlid"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
|
@ -3286,6 +3409,11 @@ msgstr "Estat invàlid"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Italian"
|
||||||
msgstr "Italià"
|
msgstr "Italià"
|
||||||
|
|
||||||
|
|
@ -3443,6 +3571,7 @@ msgstr "Carregar ranura d'estat 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Carregar Estat..."
|
msgstr "Carregar Estat..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
|
|
@ -3456,6 +3585,13 @@ msgstr "Carregar el menú del sistema Wii"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "Carregar el menú del sistema Wii"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Carregar menú del sistema Wii %d%c"
|
msgstr "Carregar menú del sistema Wii %d%c"
|
||||||
|
|
@ -3537,11 +3673,15 @@ msgstr "Modificació de velocitat MMU"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "Arxius MadCatz Gameshark (*.gcs)"
|
msgstr "Arxius MadCatz Gameshark (*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Palanca principal"
|
msgstr "Palanca principal"
|
||||||
|
|
@ -3573,10 +3713,14 @@ msgstr "Byte de memòria"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Targeta de memòria"
|
msgstr "Targeta de memòria"
|
||||||
|
|
||||||
|
|
@ -3776,11 +3920,15 @@ msgstr "NP Tabulador"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Amunt"
|
msgstr "NP Amunt"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3867,11 +4015,15 @@ msgstr "No igual"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Sense establir"
|
msgstr "Sense establir"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "No està connectat"
|
msgstr "No està connectat"
|
||||||
|
|
||||||
|
|
@ -3933,9 +4085,13 @@ msgstr "Només queden %d blocs disponibles"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Obrir"
|
msgstr "Obrir"
|
||||||
|
|
||||||
|
|
@ -4066,6 +4222,7 @@ msgstr "Pegats"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Camins"
|
msgstr "Camins"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
|
@ -4073,6 +4230,10 @@ msgstr "Camins"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pausa"
|
msgstr "Pausa"
|
||||||
|
|
@ -4093,12 +4254,17 @@ msgstr "Perspectiva %d"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Play"
|
||||||
msgstr "Executar"
|
msgstr "Executar"
|
||||||
|
|
||||||
|
|
@ -4124,11 +4290,15 @@ msgstr "Opcions de reproducció"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Jugadors"
|
msgstr "Jugadors"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Confirmeu ..."
|
msgstr "Confirmeu ..."
|
||||||
|
|
||||||
|
|
@ -4340,6 +4510,7 @@ msgstr "Actualitzar llista"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Actualitza la llista de jocs"
|
msgstr "Actualitza la llista de jocs"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
|
|
@ -4351,6 +4522,12 @@ msgstr "Actualitza la llista de jocs"
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Remove"
|
||||||
msgstr "Treure"
|
msgstr "Treure"
|
||||||
|
|
||||||
|
|
@ -4370,9 +4547,13 @@ msgstr "Renderitzar a la finestra principal"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Reiniciar"
|
msgstr "Reiniciar"
|
||||||
|
|
@ -4415,11 +4596,15 @@ msgstr "&Desa l'estat"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Segur"
|
msgstr "Segur"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Freqüència de mostreig:"
|
msgstr "Freqüència de mostreig:"
|
||||||
|
|
||||||
|
|
@ -4503,11 +4688,15 @@ msgstr "La pal·lícula guardada %s és corrupta, s'atura la gravació..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "Copia EFB escalada"
|
msgstr "Copia EFB escalada"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Escanejant %s"
|
msgstr "Escanejant %s"
|
||||||
|
|
@ -4547,6 +4736,7 @@ msgstr "La secció %s no trobada a SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Seleccionar"
|
msgstr "Seleccionar"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
|
|
@ -4562,6 +4752,14 @@ msgstr "Seleccionar el fitxer de gravació"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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 "Seleccionar el fitxer de gravació"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Seleccionar un fitxer WAD de Wii per instal·lar"
|
msgstr "Seleccionar un fitxer WAD de Wii per instal·lar"
|
||||||
|
|
||||||
|
|
@ -4586,6 +4784,7 @@ msgstr "Seleccioneu finestres flotants"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Seleccioneu el fitxer a carregar"
|
msgstr "Seleccioneu el fitxer a carregar"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
|
|
@ -4598,15 +4797,22 @@ msgstr "Seleccioneu l'estat a carregar"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Seleccioneu el fitxer de partida desada"
|
msgstr "Seleccioneu el fitxer de partida desada"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
msgid "Select the state to load"
|
msgid "Select the state to load"
|
||||||
msgstr "Seleccioneu l'estat a carregar"
|
msgstr "Seleccioneu l'estat a carregar"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Select the state to save"
|
||||||
msgstr "Seleccioneu l'estat a desar"
|
msgstr "Seleccioneu l'estat a desar"
|
||||||
|
|
||||||
|
|
@ -4989,6 +5195,7 @@ msgstr "Ha fallat la creació del buffer de so: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Espai"
|
msgstr "Espai"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
|
@ -4998,6 +5205,11 @@ msgstr "Espai"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Spanish"
|
||||||
msgstr "Espanyol"
|
msgstr "Espanyol"
|
||||||
|
|
||||||
|
|
@ -5042,11 +5254,15 @@ msgstr "Palanca quadrada"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "Control estàndard"
|
msgstr "Control estàndard"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -5082,9 +5298,13 @@ msgstr "Palanca"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Aturar"
|
msgstr "Aturar"
|
||||||
|
|
@ -5162,9 +5382,13 @@ msgstr "Taula dreta"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Capturar pantalla"
|
msgstr "Capturar pantalla"
|
||||||
|
|
||||||
|
|
@ -5411,18 +5635,26 @@ msgstr "Activar tots els tipus de registre de Log"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Activar pantalla completa"
|
msgstr "Activar pantalla completa"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Dalt"
|
msgstr "Dalt"
|
||||||
|
|
||||||
|
|
@ -5532,6 +5764,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Missatge desconegut amb id: %d rebut des del jugador: Expulsant jugador %d!"
|
"Missatge desconegut amb id: %d rebut des del jugador: Expulsant jugador %d!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
|
@ -5544,6 +5777,8 @@ msgstr ""
|
||||||
"Voleu continuar?"
|
"Voleu continuar?"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5769,11 +6004,15 @@ msgstr "Arrel de la NAND:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Importar partida guardada Wii"
|
msgstr "Importar partida guardada Wii"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Arxius de partida guardada Wii (*.bin)|*.bin"
|
msgstr "Arxius de partida guardada Wii (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5804,11 +6043,15 @@ msgstr ""
|
||||||
"o potser és perquè l'esteu fent servir fora de temps o una altra raó. \n"
|
"o potser és perquè l'esteu fent servir fora de temps o una altra raó. \n"
|
||||||
"Vols tornar a connectar-lo immediatament?"
|
"Vols tornar a connectar-lo immediatament?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote connectat"
|
msgstr "Wiimote connectat"
|
||||||
|
|
||||||
|
|
@ -5840,6 +6083,7 @@ msgstr "Finestra dreta"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Envoltant de paraula"
|
msgstr "Envoltant de paraula"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
|
|
@ -5849,6 +6093,11 @@ msgstr "Envoltant de paraula"
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Working..."
|
||||||
msgstr "Treballant ..."
|
msgstr "Treballant ..."
|
||||||
|
|
||||||
|
|
@ -6421,6 +6670,9 @@ msgstr "| O"
|
||||||
#~ msgstr "Iniciar la finestra de renderitzat a pantalla completa."
|
#~ msgstr "Iniciar la finestra de renderitzat a pantalla completa."
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#~ msgid ""
|
#~ msgid ""
|
||||||
#~ "Unknown pointer %#08x\n"
|
#~ "Unknown pointer %#08x\n"
|
||||||
#~ "Continue?"
|
#~ "Continue?"
|
||||||
|
|
@ -6428,8 +6680,11 @@ msgstr "| O"
|
||||||
#~ "Punter desconegud %#08x\n"
|
#~ "Punter desconegud %#08x\n"
|
||||||
#~ "Voleu continuar?"
|
#~ "Voleu continuar?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#~ msgid "Use FPS For Limiting"
|
#~ msgid "Use FPS For Limiting"
|
||||||
#~ msgstr "Limitar imatges/s (FPS)"
|
#~ msgstr "Limitar imatges/s (FPS)"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ msgstr ""
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
"PO-Revision-Date: 2011-10-15 14:50+0100\n"
|
"PO-Revision-Date: 2011-10-15 14:50+0100\n"
|
||||||
|
|
@ -27,6 +28,10 @@ msgstr ""
|
||||||
=======
|
=======
|
||||||
"PO-Revision-Date: 2011-12-19 07:39+0100\n"
|
"PO-Revision-Date: 2011-12-19 07:39+0100\n"
|
||||||
>>>>>>> Update Czeck translation.
|
>>>>>>> Update Czeck translation.
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
"PO-Revision-Date: 2011-12-19 07:39+0100\n"
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
"Last-Translator: Zbyněk Schwarz <zbynek.schwarz@gmail.com>\n"
|
"Last-Translator: Zbyněk Schwarz <zbynek.schwarz@gmail.com>\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
"Language: Czech\n"
|
"Language: Czech\n"
|
||||||
|
|
@ -562,6 +567,7 @@ msgstr "Přidat nový panel"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
|
||||||
|
|
@ -580,6 +586,11 @@ msgstr "Přidat nový panel"
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: 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..."
|
msgid "Add..."
|
||||||
msgstr "Přidat..."
|
msgstr "Přidat..."
|
||||||
|
|
||||||
|
|
@ -646,6 +657,7 @@ msgstr "Všechny soubory Gamecube GCM )gcm)"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
=======
|
=======
|
||||||
|
|
@ -660,6 +672,10 @@ msgstr "Všechny soubory Gamecube GCM )gcm)"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "All Save States (sav, s##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Všechny Uložené Stavy (sav, s##)"
|
msgstr "Všechny Uložené Stavy (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -762,6 +778,7 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!"
|
msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
=======
|
=======
|
||||||
|
|
@ -774,6 +791,9 @@ msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!"
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:280
|
||||||
>>>>>>> Update Greek and Czech translations
|
>>>>>>> Update Greek and Czech translations
|
||||||
=======
|
=======
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
|
|
@ -795,6 +815,7 @@ msgstr "Backend Zvuku:"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Chyba při otevírání zařízení zvukového výstupu.\n"
|
msgstr "AudioCommon: Chyba při otevírání zařízení zvukového výstupu.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
=======
|
=======
|
||||||
|
|
@ -807,6 +828,9 @@ msgstr "AudioCommon: Chyba při otevírání zařízení zvukového výstupu.\n"
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:278
|
||||||
>>>>>>> Update Greek and Czech translations
|
>>>>>>> Update Greek and Czech translations
|
||||||
=======
|
=======
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
|
|
@ -925,6 +949,7 @@ msgstr "Modrá vpravo"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
|
|
@ -937,6 +962,9 @@ msgstr "Modrá vpravo"
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Dole"
|
msgstr "Dole"
|
||||||
|
|
||||||
|
|
@ -972,6 +1000,7 @@ msgstr "Vyrovnávací paměť:"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
|
@ -984,6 +1013,9 @@ msgstr "Vyrovnávací paměť:"
|
||||||
=======
|
=======
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1216,6 +1248,7 @@ msgstr "Klient odpojen při běhu hry!! NetPlay je vypnut. Hru musíte ukončit
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
|
|
@ -1227,6 +1260,9 @@ msgstr "Klient odpojen při běhu hry!! NetPlay je vypnut. Hru musíte ukončit
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
>>>>>>> Update Greek and Czech translations
|
>>>>>>> Update Greek and Czech translations
|
||||||
=======
|
=======
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
|
|
@ -1339,6 +1375,7 @@ msgstr "Připojit Wiimote 4"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
|
@ -1349,6 +1386,9 @@ msgstr "Připojit Wiimote 4"
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Připojuji..."
|
msgstr "Připojuji..."
|
||||||
|
|
||||||
|
|
@ -1541,8 +1581,12 @@ msgstr "Jádro Emulátoru DSP"
|
||||||
>>>>>>> Update Greek and Czech translations
|
>>>>>>> Update Greek and Czech translations
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "DSP HLE emulation (fast)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "DSP HLE emulace (rychlé)"
|
msgstr "DSP HLE emulace (rychlé)"
|
||||||
|
|
||||||
|
|
@ -1766,6 +1810,7 @@ msgstr "Rozdělit"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
|
|
@ -1776,6 +1821,9 @@ msgstr "Rozdělit"
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Do you want to stop the current emulation?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Chcete současnou emulaci zastavit?"
|
msgstr "Chcete současnou emulaci zastavit?"
|
||||||
|
|
||||||
|
|
@ -1807,6 +1855,7 @@ msgstr "Dolphin FIFO"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "Dolphin GCPad Nastavení"
|
msgstr "Dolphin GCPad Nastavení"
|
||||||
|
|
@ -1835,6 +1884,14 @@ msgstr "Dolphin GCPad Nastavení"
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Dolphin GCPad Nastavení"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Doplhin Filmy TAS (*.dtm)"
|
msgstr "Doplhin Filmy TAS (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1925,6 +1982,7 @@ msgstr ""
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
|
|
@ -1943,6 +2001,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: 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"
|
msgid "Dutch"
|
||||||
msgstr "Nizozemština"
|
msgstr "Nizozemština"
|
||||||
|
|
||||||
|
|
@ -2073,18 +2136,25 @@ msgstr "Zapnout Slučování Bloků"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr "Povolit výpočet ohraničujícího rámečku"
|
msgstr "Povolit výpočet ohraničujícího rámečku"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
=======
|
=======
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Povolit vyrovnávací paměť"
|
msgstr "Povolit vyrovnávací paměť"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
|
@ -2095,6 +2165,9 @@ msgstr "Povolit vyrovnávací paměť"
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Povolit Cheaty"
|
msgstr "Povolit Cheaty"
|
||||||
|
|
||||||
|
|
@ -2232,6 +2305,7 @@ msgstr "End"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
|
|
@ -2250,6 +2324,11 @@ msgstr "End"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: 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"
|
msgid "English"
|
||||||
msgstr "Angličtina"
|
msgstr "Angličtina"
|
||||||
|
|
||||||
|
|
@ -2303,13 +2382,25 @@ msgstr ""
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Chyba"
|
msgstr "Chyba"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: 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 ""
|
||||||
|
"Chyba v PlayWiimote. %u != %u, bajt %d.\n"
|
||||||
|
"Je nám líto, nahrávání Wii je dočasně nefunkční."
|
||||||
|
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:356
|
#: Source/Core/DolphinWX/Src/Main.cpp:356
|
||||||
|
|
@ -2765,6 +2856,7 @@ msgstr "Rozhlížení pomocí myši"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
|
|
@ -2783,6 +2875,11 @@ msgstr "Rozhlížení pomocí myši"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: 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"
|
msgid "French"
|
||||||
msgstr "Francouzština"
|
msgstr "Francouzština"
|
||||||
|
|
||||||
|
|
@ -2861,8 +2958,12 @@ msgstr "Nastavení Gamecube &Pad"
|
||||||
>>>>>>> Update Greek and Czech translations
|
>>>>>>> Update Greek and Czech translations
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Paměťové karty Gamecube (*.raw,*.gcp)"
|
msgstr "Paměťové karty Gamecube (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2901,7 +3002,8 @@ msgstr ""
|
||||||
>>>>>>> Update Greek and Czech translations
|
>>>>>>> Update Greek and Czech translations
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
msgid "General"
|
msgid "General"
|
||||||
|
|
@ -2914,6 +3016,7 @@ msgstr "Obecná Nastavení"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
|
||||||
|
|
@ -2932,6 +3035,11 @@ msgstr "Obecná Nastavení"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: 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"
|
msgid "German"
|
||||||
msgstr "Němčina"
|
msgstr "Němčina"
|
||||||
|
|
||||||
|
|
@ -3073,6 +3181,7 @@ msgstr "Nastavení klávesových zkratek"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
=======
|
=======
|
||||||
|
|
@ -3086,6 +3195,10 @@ msgstr "Nastavení klávesových zkratek"
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Hotkeys"
|
msgid "Hotkeys"
|
||||||
msgstr "Klávesové zkratky"
|
msgstr "Klávesové zkratky"
|
||||||
|
|
||||||
|
|
@ -3289,6 +3402,7 @@ msgstr "Byl zavolán InstallExceptionHandler, ale tato platforma toto ještě ne
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
|
|
@ -3299,6 +3413,9 @@ msgstr "Byl zavolán InstallExceptionHandler, ale tato platforma toto ještě ne
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "Instaluji WAD..."
|
msgstr "Instaluji WAD..."
|
||||||
|
|
||||||
|
|
@ -3383,6 +3500,7 @@ msgstr "Neplatný stav"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
|
||||||
|
|
@ -3401,6 +3519,11 @@ msgstr "Neplatný stav"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: 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"
|
msgid "Italian"
|
||||||
msgstr "Italština"
|
msgstr "Italština"
|
||||||
|
|
||||||
|
|
@ -3561,6 +3684,7 @@ msgstr "Nahrát Stav..."
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Nahrát Systémové Menu Wii"
|
msgstr "Nahrát Systémové Menu Wii"
|
||||||
|
|
@ -3587,6 +3711,13 @@ msgstr "Nahrát Systémové Menu Wii"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "Nahrát Systémové Menu Wii"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Nahrát Systémové Menu Wii %d%c"
|
msgstr "Nahrát Systémové Menu Wii %d%c"
|
||||||
|
|
@ -3671,6 +3802,7 @@ msgstr "Soubory MadCatz Gameshark (*.gcs)"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
|
@ -3681,6 +3813,9 @@ msgstr "Soubory MadCatz Gameshark (*.gcs)"
|
||||||
=======
|
=======
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Hlavní Stick"
|
msgstr "Hlavní Stick"
|
||||||
|
|
@ -3714,6 +3849,7 @@ msgstr "Bajt Paměti"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
|
|
@ -3726,6 +3862,9 @@ msgstr "Bajt Paměti"
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Paměťová karta"
|
msgstr "Paměťová karta"
|
||||||
|
|
||||||
|
|
@ -3916,6 +4055,7 @@ msgstr "NK Nahoru"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
|
|
@ -3925,6 +4065,9 @@ msgstr "NK Nahoru"
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -4014,6 +4157,7 @@ msgstr "Nenastaven"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
|
@ -4024,6 +4168,9 @@ msgstr "Nenastaven"
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Nepřipojen"
|
msgstr "Nepřipojen"
|
||||||
|
|
||||||
|
|
@ -4095,7 +4242,11 @@ msgstr "Pouze bloky %d jsou dostupné"
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
|
<<<<<<< HEAD
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Otevřít"
|
msgstr "Otevřít"
|
||||||
|
|
||||||
|
|
@ -4225,6 +4376,7 @@ msgstr "Cesty"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
=======
|
=======
|
||||||
|
|
@ -4237,6 +4389,10 @@ msgstr "Cesty"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: 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
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pozastavit"
|
msgstr "Pozastavit"
|
||||||
|
|
@ -4272,9 +4428,14 @@ msgstr "Perspektiva %d"
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Play"
|
msgid "Play"
|
||||||
msgstr "Spustit"
|
msgstr "Spustit"
|
||||||
|
|
||||||
|
|
@ -4303,6 +4464,7 @@ msgstr "Hráči"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
|
|
@ -4313,6 +4475,9 @@ msgstr "Hráči"
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Prosím potvrďte..."
|
msgstr "Prosím potvrďte..."
|
||||||
|
|
||||||
|
|
@ -4526,6 +4691,7 @@ msgstr "Obnovit seznam her"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
|
|
@ -4548,6 +4714,12 @@ msgstr "Obnovit seznam her"
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: 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"
|
msgid "Remove"
|
||||||
msgstr "Odstranit"
|
msgstr "Odstranit"
|
||||||
|
|
||||||
|
|
@ -4578,6 +4750,7 @@ msgstr "Vykreslit do Hlavního okna"
|
||||||
=======
|
=======
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Resetovat"
|
msgstr "Resetovat"
|
||||||
|
|
@ -4624,6 +4797,7 @@ msgstr "Uložit Sta&v"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Bezpečná"
|
msgstr "Bezpečná"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
|
@ -4634,6 +4808,9 @@ msgstr "Bezpečná"
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Vzorkovací frekvence:"
|
msgstr "Vzorkovací frekvence:"
|
||||||
|
|
||||||
|
|
@ -4721,6 +4898,7 @@ msgstr "Uložený stav filmu %s je poškozen, nahrávání filmu je zastaveno...
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "EFB Kopie Změněné Velikosti"
|
msgstr "EFB Kopie Změněné Velikosti"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
|
@ -4731,6 +4909,9 @@ msgstr "EFB Kopie Změněné Velikosti"
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Skenuji %s"
|
msgstr "Skenuji %s"
|
||||||
|
|
@ -4772,6 +4953,7 @@ msgstr "Sekce %s nebyla v SYSCONF nalezena"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Vybrat"
|
msgstr "Vybrat"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
|
|
@ -4795,6 +4977,14 @@ msgstr "Vyberte Soubor s Nahrávkou"
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
|
msgid "Select The Recording File"
|
||||||
|
msgstr "Vyberte Soubor s Nahrávkou"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Vyberte soubor Wii WAD k instalování"
|
msgstr "Vyberte soubor Wii WAD k instalování"
|
||||||
|
|
||||||
|
|
@ -4823,6 +5013,7 @@ msgstr "Vyberte soubor k nahrání"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Vyberte soubor s uloženou hrou"
|
msgstr "Vyberte soubor s uloženou hrou"
|
||||||
|
|
@ -4840,13 +5031,17 @@ msgstr "Vyberte stav k nahrání"
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Vyberte soubor s uloženou hrou"
|
msgstr "Vyberte soubor s uloženou hrou"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
msgid "Select the state to load"
|
msgid "Select the state to load"
|
||||||
msgstr "Vyberte stav k nahrání"
|
msgstr "Vyberte stav k nahrání"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
|
|
@ -4857,6 +5052,9 @@ msgstr "Vyberte stav k nahrání"
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select the state to save"
|
msgid "Select the state to save"
|
||||||
msgstr "Vyberte stav k uložení"
|
msgstr "Vyberte stav k uložení"
|
||||||
|
|
||||||
|
|
@ -5219,6 +5417,7 @@ msgstr "Mezerník"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
|
||||||
|
|
@ -5237,6 +5436,11 @@ msgstr "Mezerník"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: 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"
|
msgid "Spanish"
|
||||||
msgstr "Španělština"
|
msgstr "Španělština"
|
||||||
|
|
||||||
|
|
@ -5275,6 +5479,7 @@ msgstr "Standardní Ovladač"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
|
|
@ -5284,6 +5489,9 @@ msgstr "Standardní Ovladač"
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -5330,7 +5538,11 @@ msgstr "Stick"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
|
<<<<<<< HEAD
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Zastavit"
|
msgstr "Zastavit"
|
||||||
|
|
@ -5415,7 +5627,11 @@ msgstr "Deska vpravo"
|
||||||
>>>>>>> Update Greek and Czech translations
|
>>>>>>> Update Greek and Czech translations
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
|
<<<<<<< HEAD
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Vytvořit Snímek Obrazovky"
|
msgstr "Vytvořit Snímek Obrazovky"
|
||||||
|
|
||||||
|
|
@ -5650,15 +5866,20 @@ msgstr "Přepnout na Celou Obrazovku"
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Přepnout na Celou Obrazovku"
|
msgstr "Přepnout na Celou Obrazovku"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
>>>>>>> Update Greek and Czech translations
|
>>>>>>> Update Greek and Czech translations
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Nahoře"
|
msgstr "Nahoře"
|
||||||
|
|
||||||
|
|
@ -5766,6 +5987,7 @@ msgstr "Přijata neznámá zpráva s id : %d"
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr "Neznámá zpráva s id:%d přijata od hráče:%d Vyhazuji hráče!"
|
msgstr "Neznámá zpráva s id:%d přijata od hráče:%d Vyhazuji hráče!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
|
@ -5786,6 +6008,8 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
=======
|
=======
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -6005,6 +6229,7 @@ msgstr "Import uložených pozic Wii"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
|
|
@ -6015,6 +6240,9 @@ msgstr "Import uložených pozic Wii"
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Wii save files (*.bin)|*.bin"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Wii soubory s uložením (*.bin)|*.bin"
|
msgstr "Wii soubory s uložením (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -6048,6 +6276,7 @@ msgstr ""
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
|
|
@ -6058,6 +6287,9 @@ msgstr ""
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote Připojen"
|
msgstr "Wiimote Připojen"
|
||||||
|
|
||||||
|
|
@ -6092,6 +6324,7 @@ msgstr "Zalamování textu"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
|
||||||
|
|
@ -6106,6 +6339,11 @@ msgstr "Zalamování textu"
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Working..."
|
||||||
msgstr "Pracuji..."
|
msgstr "Pracuji..."
|
||||||
|
|
||||||
|
|
@ -6714,6 +6952,9 @@ msgstr "| NEBO"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#~ msgid ""
|
#~ msgid ""
|
||||||
#~ "Unknown pointer %#08x\n"
|
#~ "Unknown pointer %#08x\n"
|
||||||
#~ "Continue?"
|
#~ "Continue?"
|
||||||
|
|
@ -6721,6 +6962,7 @@ msgstr "| NEBO"
|
||||||
#~ "Neznámý ukazatel %#08x\n"
|
#~ "Neznámý ukazatel %#08x\n"
|
||||||
#~ "Pokračovat?"
|
#~ "Pokračovat?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
=======
|
=======
|
||||||
|
|
@ -6757,6 +6999,8 @@ msgstr "| NEBO"
|
||||||
>>>>>>> Update Greek and Czech translations
|
>>>>>>> Update Greek and Czech translations
|
||||||
=======
|
=======
|
||||||
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
>>>>>>> The actual update of the Greek and Czech translations. The last commit
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#~ msgid "Use FPS For Limiting"
|
#~ msgid "Use FPS For Limiting"
|
||||||
#~ msgstr "Použít SzS pro Omezení"
|
#~ msgstr "Použít SzS pro Omezení"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,10 +8,14 @@ msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
=======
|
=======
|
||||||
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
"PO-Revision-Date: 2011-02-17 01:23+0100\n"
|
"PO-Revision-Date: 2011-02-17 01:23+0100\n"
|
||||||
"Last-Translator: LucasX <lucasx790@gmail.com>\n"
|
"Last-Translator: LucasX <lucasx790@gmail.com>\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
|
|
@ -555,6 +559,7 @@ msgstr "Patch hinzufügen"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Neue Palette hinzufügen"
|
msgstr "Neue Palette hinzufügen"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
|
|
@ -564,6 +569,11 @@ msgstr "Neue Palette hinzufügen"
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Add..."
|
||||||
msgstr "Hinzufügen..."
|
msgstr "Hinzufügen..."
|
||||||
|
|
||||||
|
|
@ -632,6 +642,7 @@ msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Alle Gamecube GCM Dateien (gcm)"
|
msgstr "Alle Gamecube GCM Dateien (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
|
@ -639,6 +650,10 @@ msgstr "Alle Gamecube GCM Dateien (gcm)"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Alle Speicherstände (sav, s##)"
|
msgstr "Alle Speicherstände (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -721,11 +736,15 @@ msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Soll die Datei gelöscht werden? Löschen kann nicht Rückgängig gemacht werden."
|
"Soll die Datei gelöscht werden? Löschen kann nicht Rückgängig gemacht werden."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Seitenverhältnis:"
|
msgstr "Seitenverhältnis:"
|
||||||
|
|
@ -746,11 +765,15 @@ msgstr "Audio Backend:"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n"
|
msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Automatisch"
|
msgstr "Automatisch"
|
||||||
|
|
@ -865,10 +888,14 @@ msgstr "Blau rechts"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Unten"
|
msgstr "Unten"
|
||||||
|
|
||||||
|
|
@ -901,11 +928,15 @@ msgstr "Ausgabeverzeichnis auswählen"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Buffer:"
|
msgstr "Buffer:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1145,10 +1176,14 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Schließen"
|
msgstr "Schließen"
|
||||||
|
|
@ -1258,11 +1293,15 @@ msgstr "Wiimote 3 verbinden"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Wiimote 4 verbinden"
|
msgstr "Wiimote 4 verbinden"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Verbinden..."
|
msgstr "Verbinden..."
|
||||||
|
|
||||||
|
|
@ -1455,10 +1494,14 @@ msgstr "DSP Emulator Engine"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "DSP HLE Emulation (schnell)"
|
msgstr "DSP HLE Emulation (schnell)"
|
||||||
|
|
||||||
|
|
@ -1675,11 +1718,15 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Dividieren"
|
msgstr "Dividieren"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Laufende Emulation stoppen?"
|
msgstr "Laufende Emulation stoppen?"
|
||||||
|
|
||||||
|
|
@ -1709,6 +1756,7 @@ msgstr "Dolphin Emulierte-Wiimote Einstellungen"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin"
|
msgstr "Dolphin"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
|
@ -1724,6 +1772,14 @@ msgstr "Dolphin GCPad Konfiguration"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Dolphin GCPad Konfiguration"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Dolphin TAS Filme (*.dtm)"
|
msgstr "Dolphin TAS Filme (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1811,6 +1867,7 @@ msgid ""
|
||||||
"If unsure, leave this unchecked."
|
"If unsure, leave this unchecked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
|
|
@ -1820,6 +1877,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Dutch"
|
||||||
msgstr "Holländisch"
|
msgstr "Holländisch"
|
||||||
|
|
||||||
|
|
@ -1948,22 +2010,32 @@ msgid "Enable Block Merging"
|
||||||
msgstr "Blockvereinigung aktivieren"
|
msgstr "Blockvereinigung aktivieren"
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Cache verwenden"
|
msgstr "Cache verwenden"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Cheats aktivieren"
|
msgstr "Cheats aktivieren"
|
||||||
|
|
||||||
|
|
@ -2102,6 +2174,7 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Ende"
|
msgstr "Ende"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
|
@ -2111,6 +2184,11 @@ msgstr "Ende"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "English"
|
||||||
msgstr "Englisch"
|
msgstr "Englisch"
|
||||||
|
|
||||||
|
|
@ -2140,6 +2218,7 @@ msgstr "Gleich"
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Fehler"
|
msgstr "Fehler"
|
||||||
|
|
@ -2157,6 +2236,19 @@ msgid "Error"
|
||||||
msgstr "Fehler"
|
msgstr "Fehler"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Fehler"
|
||||||
|
|
||||||
|
#: 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
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2617,6 +2709,7 @@ msgstr ""
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Frei Umsehen"
|
msgstr "Frei Umsehen"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
|
@ -2626,6 +2719,11 @@ msgstr "Frei Umsehen"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "French"
|
||||||
msgstr "Französisch"
|
msgstr "Französisch"
|
||||||
|
|
||||||
|
|
@ -2695,10 +2793,14 @@ msgstr "Gamecube-&Pad Einstellungen"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Gamecube Memory Cards (*.raw,*.gcp)"
|
msgstr "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2723,11 +2825,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Allgemein"
|
msgstr "Allgemein"
|
||||||
|
|
@ -2737,6 +2844,7 @@ msgstr "Allgemein"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Interface Einstellungen"
|
msgstr "Interface Einstellungen"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
|
@ -2746,6 +2854,11 @@ msgstr "Interface Einstellungen"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "German"
|
||||||
msgstr "Deutsch"
|
msgstr "Deutsch"
|
||||||
|
|
||||||
|
|
@ -2871,11 +2984,16 @@ msgstr "Tastenkürzel Einstellungen"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Hotkeys"
|
||||||
msgstr "Tastenkürzel"
|
msgstr "Tastenkürzel"
|
||||||
|
|
||||||
|
|
@ -3090,11 +3208,15 @@ msgstr ""
|
||||||
"InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn "
|
"InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn "
|
||||||
"noch nicht."
|
"noch nicht."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "WAD ins Wii-Menü installieren..."
|
msgstr "WAD ins Wii-Menü installieren..."
|
||||||
|
|
@ -3180,6 +3302,7 @@ msgstr "Ungültige Aufnahmedatei"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Ungültiger Status"
|
msgstr "Ungültiger Status"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
|
@ -3189,6 +3312,11 @@ msgstr "Ungültiger Status"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Italian"
|
||||||
msgstr "Italienisch"
|
msgstr "Italienisch"
|
||||||
|
|
||||||
|
|
@ -3347,20 +3475,28 @@ msgstr "Status aus Slot 8 laden"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Status laden..."
|
msgstr "Status laden..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Wii-Menü laden (%d %c)"
|
msgstr "Wii-Menü laden (%d %c)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Wii-Menü laden (%d %c)"
|
msgstr "Wii-Menü laden (%d %c)"
|
||||||
|
|
@ -3445,11 +3581,15 @@ msgstr "MMU Speed Hack"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "MadCatz Gameshark Dateien(*.gcs)"
|
msgstr "MadCatz Gameshark Dateien(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Main Stick"
|
msgstr "Main Stick"
|
||||||
|
|
@ -3482,10 +3622,14 @@ msgstr "Speicher"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Memory Card"
|
msgstr "Memory Card"
|
||||||
|
|
||||||
|
|
@ -3672,11 +3816,15 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Hoch"
|
msgstr "NP Hoch"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3764,11 +3912,15 @@ msgstr "Ungleich"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Nicht Festgelegt"
|
msgstr "Nicht Festgelegt"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Nicht Verbunden"
|
msgstr "Nicht Verbunden"
|
||||||
|
|
||||||
|
|
@ -3830,9 +3982,13 @@ msgstr "Nur %d Blöcke verfügbar"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Öffnen"
|
msgstr "Öffnen"
|
||||||
|
|
||||||
|
|
@ -3964,6 +4120,7 @@ msgstr "Patches"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Pfade"
|
msgstr "Pfade"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
|
@ -3971,6 +4128,10 @@ msgstr "Pfade"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pause"
|
msgstr "Pause"
|
||||||
|
|
@ -3992,12 +4153,17 @@ msgstr "Perspektive %d"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Play"
|
||||||
msgstr "Start"
|
msgstr "Start"
|
||||||
|
|
||||||
|
|
@ -4024,11 +4190,15 @@ msgstr "Optionen"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Spieler"
|
msgstr "Spieler"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Bitte Bestätigen..."
|
msgstr "Bitte Bestätigen..."
|
||||||
|
|
||||||
|
|
@ -4244,6 +4414,7 @@ msgstr "Liste aktualisieren"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Spieleliste aktualisieren"
|
msgstr "Spieleliste aktualisieren"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
|
|
@ -4255,6 +4426,12 @@ msgstr "Spieleliste aktualisieren"
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Remove"
|
||||||
msgstr "Entfernen"
|
msgstr "Entfernen"
|
||||||
|
|
||||||
|
|
@ -4274,9 +4451,13 @@ msgstr "Im Hauptfenster Rendern"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Zurücksetzen"
|
msgstr "Zurücksetzen"
|
||||||
|
|
@ -4319,11 +4500,15 @@ msgstr "S&tatus speichern"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Sicher"
|
msgstr "Sicher"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Abtastrate:"
|
msgstr "Abtastrate:"
|
||||||
|
|
||||||
|
|
@ -4408,11 +4593,15 @@ msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "EFB Scaled Copy"
|
msgstr "EFB Scaled Copy"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Suche..."
|
msgstr "Suche..."
|
||||||
|
|
@ -4452,6 +4641,7 @@ msgstr "Ausgewähltes %s nicht gefunden in SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Auswählen"
|
msgstr "Auswählen"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
|
|
@ -4467,6 +4657,14 @@ msgstr "Aufnahmedatei auswählen"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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 "Aufnahmedatei auswählen"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Speicherdatei zum Importieren auswählen"
|
msgstr "Speicherdatei zum Importieren auswählen"
|
||||||
|
|
@ -4493,6 +4691,7 @@ msgstr "Wähle unverankerte Fenster"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Datei zum Laden auswählen"
|
msgstr "Datei zum Laden auswählen"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
|
|
@ -4505,15 +4704,22 @@ msgstr "Status zum Laden auswählen"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Wii-Spielstand auswählen"
|
msgstr "Wii-Spielstand auswählen"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
msgid "Select the state to load"
|
msgid "Select the state to load"
|
||||||
msgstr "Status zum Laden auswählen"
|
msgstr "Status zum Laden auswählen"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Select the state to save"
|
||||||
msgstr "Status zum Speichern auswählen"
|
msgstr "Status zum Speichern auswählen"
|
||||||
|
|
||||||
|
|
@ -4869,6 +5075,7 @@ msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Leertaste"
|
msgstr "Leertaste"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
|
@ -4878,6 +5085,11 @@ msgstr "Leertaste"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Spanish"
|
||||||
msgstr "Spanisch"
|
msgstr "Spanisch"
|
||||||
|
|
||||||
|
|
@ -4913,11 +5125,15 @@ msgstr ""
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "Standard-Controller"
|
msgstr "Standard-Controller"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4953,9 +5169,13 @@ msgstr "Stick"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Stopp"
|
msgstr "Stopp"
|
||||||
|
|
@ -5029,9 +5249,13 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Screenshot erstellen"
|
msgstr "Screenshot erstellen"
|
||||||
|
|
||||||
|
|
@ -5278,18 +5502,26 @@ msgstr "Alle umschalten"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Vollbildmodus wechseln"
|
msgstr "Vollbildmodus wechseln"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Oben"
|
msgstr "Oben"
|
||||||
|
|
||||||
|
|
@ -5394,6 +5626,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Unbekannte Meldung mit ID %d erhalten von Spieler %d, Spieler herausgeworfen!"
|
"Unbekannte Meldung mit ID %d erhalten von Spieler %d, Spieler herausgeworfen!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
|
@ -5406,6 +5639,8 @@ msgstr ""
|
||||||
"Fortfahren?"
|
"Fortfahren?"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5616,11 +5851,15 @@ msgstr "DVD Laufwerk:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Wii Spielstand importieren"
|
msgstr "Wii Spielstand importieren"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Wii Speicherdateien (*.bin)|*.bin"
|
msgstr "Wii Speicherdateien (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5651,11 +5890,15 @@ msgstr ""
|
||||||
"oder die Wiimote war zulange inaktiv oder andere Ursachen.\n"
|
"oder die Wiimote war zulange inaktiv oder andere Ursachen.\n"
|
||||||
"Soll die Wiimote jetzt wieder verbunden werden?"
|
"Soll die Wiimote jetzt wieder verbunden werden?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote Verbunden"
|
msgstr "Wiimote Verbunden"
|
||||||
|
|
||||||
|
|
@ -5688,6 +5931,7 @@ msgstr "Windows Rechts"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Zeilenumbruch"
|
msgstr "Zeilenumbruch"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
|
|
@ -5697,6 +5941,11 @@ msgstr "Zeilenumbruch"
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Working..."
|
||||||
msgstr "Arbeite..."
|
msgstr "Arbeite..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,10 +9,14 @@ msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
=======
|
=======
|
||||||
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
@ -510,6 +514,7 @@ msgstr ""
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
|
|
@ -519,6 +524,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Add..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -572,6 +582,7 @@ msgstr ""
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
|
@ -579,6 +590,10 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -656,11 +671,15 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -681,11 +700,15 @@ msgstr ""
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -794,10 +817,14 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -830,11 +857,15 @@ msgstr ""
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1057,10 +1088,14 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1169,11 +1204,15 @@ msgstr ""
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1349,10 +1388,14 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1562,11 +1605,15 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1595,6 +1642,7 @@ msgstr ""
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
|
@ -1610,6 +1658,14 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1692,6 +1748,7 @@ msgid ""
|
||||||
"If unsure, leave this unchecked."
|
"If unsure, leave this unchecked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
|
|
@ -1701,6 +1758,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Dutch"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1824,21 +1886,31 @@ msgid "Enable Block Merging"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1964,6 +2036,7 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
|
@ -1973,6 +2046,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "English"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2002,6 +2080,7 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2019,6 +2098,19 @@ msgid "Error"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
|
msgid "Error"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: 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
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2433,6 +2525,7 @@ msgstr ""
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
|
@ -2442,6 +2535,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "French"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2508,10 +2606,14 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2533,11 +2635,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2546,6 +2653,7 @@ msgstr ""
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
|
@ -2555,6 +2663,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "German"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2670,11 +2783,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Hotkeys"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2864,11 +2982,15 @@ msgid ""
|
||||||
"InstallExceptionHandler called, but this platform does not yet support it."
|
"InstallExceptionHandler called, but this platform does not yet support it."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2945,6 +3067,7 @@ msgstr ""
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
|
@ -2954,6 +3077,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Italian"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3104,6 +3232,7 @@ msgstr ""
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
|
|
@ -3117,6 +3246,13 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3193,11 +3329,15 @@ msgstr ""
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3229,10 +3369,14 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3409,11 +3553,15 @@ msgstr ""
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3500,11 +3648,15 @@ msgstr ""
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3566,9 +3718,13 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3694,6 +3850,7 @@ msgstr ""
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
|
@ -3701,6 +3858,10 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3721,12 +3882,17 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Play"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3752,11 +3918,15 @@ msgstr ""
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3962,6 +4132,7 @@ msgstr ""
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
|
|
@ -3973,6 +4144,12 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Remove"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3989,9 +4166,13 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4034,11 +4215,15 @@ msgstr ""
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4122,11 +4307,15 @@ msgstr ""
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4166,6 +4355,7 @@ msgstr ""
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
|
|
@ -4181,6 +4371,14 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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 ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4203,6 +4401,7 @@ msgstr ""
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
|
|
@ -4215,15 +4414,22 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
msgid "Select the state to load"
|
msgid "Select the state to load"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Select the state to save"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4557,6 +4763,7 @@ msgstr ""
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
|
@ -4566,6 +4773,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Spanish"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4601,11 +4813,15 @@ msgstr ""
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4641,9 +4857,13 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4716,9 +4936,13 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4931,18 +5155,26 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5044,6 +5276,7 @@ msgstr ""
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
|
@ -5054,6 +5287,8 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5255,11 +5490,15 @@ msgstr ""
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5286,11 +5525,15 @@ msgid ""
|
||||||
"Do you want to reconnect immediately?"
|
"Do you want to reconnect immediately?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5322,6 +5565,7 @@ msgstr ""
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
|
|
@ -5331,6 +5575,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Working..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -8,10 +8,14 @@ msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
=======
|
=======
|
||||||
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
"PO-Revision-Date: 2011-01-06 14:53+0100\n"
|
"PO-Revision-Date: 2011-01-06 14:53+0100\n"
|
||||||
"Last-Translator: BhaaL <bhaal@0x1337.org>\n"
|
"Last-Translator: BhaaL <bhaal@0x1337.org>\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
|
|
@ -509,6 +513,7 @@ msgstr ""
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
|
|
@ -518,6 +523,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Add..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -571,6 +581,7 @@ msgstr ""
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
|
@ -578,6 +589,10 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -655,11 +670,15 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -680,11 +699,15 @@ msgstr ""
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -793,10 +816,14 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -829,11 +856,15 @@ msgstr ""
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1056,10 +1087,14 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1168,11 +1203,15 @@ msgstr ""
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1348,10 +1387,14 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1561,11 +1604,15 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1594,6 +1641,7 @@ msgstr ""
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
|
@ -1609,6 +1657,14 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1691,6 +1747,7 @@ msgid ""
|
||||||
"If unsure, leave this unchecked."
|
"If unsure, leave this unchecked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
|
|
@ -1700,6 +1757,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Dutch"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1823,21 +1885,31 @@ msgid "Enable Block Merging"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1963,6 +2035,7 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
|
@ -1972,6 +2045,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "English"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2001,6 +2079,7 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2018,6 +2097,19 @@ msgid "Error"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
|
msgid "Error"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: 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
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2432,6 +2524,7 @@ msgstr ""
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
|
@ -2441,6 +2534,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "French"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2507,10 +2605,14 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2532,11 +2634,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2545,6 +2652,7 @@ msgstr ""
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
|
@ -2554,6 +2662,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "German"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2669,11 +2782,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Hotkeys"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2863,11 +2981,15 @@ msgid ""
|
||||||
"InstallExceptionHandler called, but this platform does not yet support it."
|
"InstallExceptionHandler called, but this platform does not yet support it."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2944,6 +3066,7 @@ msgstr ""
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
|
@ -2953,6 +3076,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Italian"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3103,6 +3231,7 @@ msgstr ""
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
|
|
@ -3116,6 +3245,13 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3192,11 +3328,15 @@ msgstr ""
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3228,10 +3368,14 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3408,11 +3552,15 @@ msgstr ""
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3499,11 +3647,15 @@ msgstr ""
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3565,9 +3717,13 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3693,6 +3849,7 @@ msgstr ""
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
|
@ -3700,6 +3857,10 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3720,12 +3881,17 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Play"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3751,11 +3917,15 @@ msgstr ""
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3961,6 +4131,7 @@ msgstr ""
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
|
|
@ -3972,6 +4143,12 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Remove"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3988,9 +4165,13 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4033,11 +4214,15 @@ msgstr ""
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4121,11 +4306,15 @@ msgstr ""
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4165,6 +4354,7 @@ msgstr ""
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
|
|
@ -4180,6 +4370,14 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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 ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4202,6 +4400,7 @@ msgstr ""
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
|
|
@ -4214,15 +4413,22 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
msgid "Select the state to load"
|
msgid "Select the state to load"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Select the state to save"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4556,6 +4762,7 @@ msgstr ""
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
|
@ -4565,6 +4772,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Spanish"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4600,11 +4812,15 @@ msgstr ""
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4640,9 +4856,13 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4715,9 +4935,13 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4930,18 +5154,26 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5043,6 +5275,7 @@ msgstr ""
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
|
@ -5053,6 +5286,8 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5254,11 +5489,15 @@ msgstr ""
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5285,11 +5524,15 @@ msgid ""
|
||||||
"Do you want to reconnect immediately?"
|
"Do you want to reconnect immediately?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5321,6 +5564,7 @@ msgstr ""
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
|
|
@ -5330,6 +5574,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Working..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -8,10 +8,14 @@ msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
=======
|
=======
|
||||||
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
"PO-Revision-Date: 2011-01-08 20:50+0200\n"
|
"PO-Revision-Date: 2011-01-08 20:50+0200\n"
|
||||||
"Last-Translator: Ely <nakeee@gmail.com>\n"
|
"Last-Translator: Ely <nakeee@gmail.com>\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
|
|
@ -510,6 +514,7 @@ msgstr ""
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
|
|
@ -519,6 +524,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Add..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -572,6 +582,7 @@ msgstr ""
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
|
@ -579,6 +590,10 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -656,11 +671,15 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -681,11 +700,15 @@ msgstr ""
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -795,10 +818,14 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -831,11 +858,15 @@ msgstr ""
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1058,10 +1089,14 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1170,11 +1205,15 @@ msgstr ""
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1350,10 +1389,14 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1563,11 +1606,15 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1596,15 +1643,20 @@ msgstr ""
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
msgstr "הגדרות גרפיקה"
|
msgstr "הגדרות גרפיקה"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
|
@ -1612,6 +1664,10 @@ msgstr "הגדרות גרפיקה"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1694,6 +1750,7 @@ msgid ""
|
||||||
"If unsure, leave this unchecked."
|
"If unsure, leave this unchecked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
|
|
@ -1703,6 +1760,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Dutch"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1826,21 +1888,31 @@ msgid "Enable Block Merging"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1966,6 +2038,7 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
|
@ -1975,6 +2048,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "English"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2004,6 +2082,7 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2021,6 +2100,19 @@ msgid "Error"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
|
msgid "Error"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: 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
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2435,6 +2527,7 @@ msgstr ""
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
|
@ -2444,6 +2537,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "French"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2513,10 +2611,14 @@ msgstr "הגדרות קול"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2538,11 +2640,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2552,6 +2659,7 @@ msgstr ""
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "הגדרות קול"
|
msgstr "הגדרות קול"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
|
@ -2561,6 +2669,11 @@ msgstr "הגדרות קול"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "German"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2676,11 +2789,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Hotkeys"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2870,11 +2988,15 @@ msgid ""
|
||||||
"InstallExceptionHandler called, but this platform does not yet support it."
|
"InstallExceptionHandler called, but this platform does not yet support it."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2951,6 +3073,7 @@ msgstr ""
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
|
@ -2960,6 +3083,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Italian"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3110,6 +3238,7 @@ msgstr ""
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
|
|
@ -3123,6 +3252,13 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3200,11 +3336,15 @@ msgstr ""
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3236,10 +3376,14 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3416,11 +3560,15 @@ msgstr ""
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3507,11 +3655,15 @@ msgstr ""
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3573,9 +3725,13 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3701,6 +3857,7 @@ msgstr ""
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
|
@ -3708,6 +3865,10 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3728,12 +3889,17 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Play"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3759,11 +3925,15 @@ msgstr ""
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3969,6 +4139,7 @@ msgstr ""
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
|
|
@ -3980,6 +4151,12 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Remove"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3996,9 +4173,13 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4041,11 +4222,15 @@ msgstr ""
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4129,11 +4314,15 @@ msgstr ""
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4173,6 +4362,7 @@ msgstr ""
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
|
|
@ -4188,6 +4378,14 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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 ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4210,6 +4408,7 @@ msgstr ""
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
|
|
@ -4222,15 +4421,22 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
msgid "Select the state to load"
|
msgid "Select the state to load"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Select the state to save"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4566,6 +4772,7 @@ msgstr ""
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
|
@ -4575,6 +4782,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Spanish"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4610,11 +4822,15 @@ msgstr ""
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4650,9 +4866,13 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4725,9 +4945,13 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4940,18 +5164,26 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5053,6 +5285,7 @@ msgstr ""
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
|
@ -5063,6 +5296,8 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5265,11 +5500,15 @@ msgstr ""
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5296,11 +5535,15 @@ msgid ""
|
||||||
"Do you want to reconnect immediately?"
|
"Do you want to reconnect immediately?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5332,6 +5575,7 @@ msgstr ""
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
|
|
@ -5341,6 +5585,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Working..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -8,10 +8,14 @@ msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
=======
|
=======
|
||||||
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
"PO-Revision-Date: 2011-04-08 20:40+0100\n"
|
"PO-Revision-Date: 2011-04-08 20:40+0100\n"
|
||||||
"Last-Translator: RebuMan, Dolphin Team\n"
|
"Last-Translator: RebuMan, Dolphin Team\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
|
|
@ -556,6 +560,7 @@ msgstr "Aggiungi Patch"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Aggiungi nuovo riquadro"
|
msgstr "Aggiungi nuovo riquadro"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
|
|
@ -565,6 +570,11 @@ msgstr "Aggiungi nuovo riquadro"
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Add..."
|
||||||
msgstr "Aggiungi..."
|
msgstr "Aggiungi..."
|
||||||
|
|
||||||
|
|
@ -636,6 +646,7 @@ msgstr "Tutti i file di immagine GC/Wii (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Tutti i file GCM GameCube (gcm)"
|
msgstr "Tutti i file GCM GameCube (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
|
@ -643,6 +654,10 @@ msgstr "Tutti i file GCM GameCube (gcm)"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)"
|
msgstr "Tutti gli Stati di Gioco Salvati (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -726,11 +741,15 @@ msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Sei sicuro di voler eliminare questo file? Sarà cancellato definitivamente!"
|
"Sei sicuro di voler eliminare questo file? Sarà cancellato definitivamente!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Aspetto:"
|
msgstr "Aspetto:"
|
||||||
|
|
@ -751,11 +770,15 @@ msgstr "Interfaccia Audio:"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n"
|
msgstr "Audiocommon: Errore nell'apertura della periferica AO.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Auto"
|
msgstr "Auto"
|
||||||
|
|
@ -869,10 +892,14 @@ msgstr "Blu Destro"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Sotto"
|
msgstr "Sotto"
|
||||||
|
|
||||||
|
|
@ -905,11 +932,15 @@ msgstr "Cerca una directory di destinazione"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Buffer:"
|
msgstr "Buffer:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1148,10 +1179,14 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Chiudi"
|
msgstr "Chiudi"
|
||||||
|
|
@ -1261,11 +1296,15 @@ msgstr "Collega Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Collega Wiimote 4"
|
msgstr "Collega Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Connessione in corso..."
|
msgstr "Connessione in corso..."
|
||||||
|
|
||||||
|
|
@ -1455,10 +1494,14 @@ msgstr "Motore di Emulazione DSP"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "Emulazione DSP HLE (veloce)"
|
msgstr "Emulazione DSP HLE (veloce)"
|
||||||
|
|
||||||
|
|
@ -1678,11 +1721,15 @@ msgstr "Visualizza i tasti di input letti dall'emulatore."
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "/"
|
msgstr "/"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Vuoi interrompere l'emulazione in corso?"
|
msgstr "Vuoi interrompere l'emulazione in corso?"
|
||||||
|
|
||||||
|
|
@ -1711,6 +1758,7 @@ msgstr "Dolphin - Configurazione Wiimote Emulato"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin FIFO"
|
msgstr "Dolphin FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
|
@ -1726,6 +1774,14 @@ msgstr "Dolphin - Configurazione Controlli GC"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Dolphin - Configurazione Controlli GC"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Filmati TAS Dolphin (*.dtm)"
|
msgstr "Filmati TAS Dolphin (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1814,6 +1870,7 @@ msgid ""
|
||||||
"If unsure, leave this unchecked."
|
"If unsure, leave this unchecked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
|
|
@ -1823,6 +1880,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Dutch"
|
||||||
msgstr "Olandese"
|
msgstr "Olandese"
|
||||||
|
|
||||||
|
|
@ -1952,22 +2014,32 @@ msgid "Enable Block Merging"
|
||||||
msgstr "Attiva Unione Blocchi"
|
msgstr "Attiva Unione Blocchi"
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Attiva Cache"
|
msgstr "Attiva Cache"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Abilita Trucchi"
|
msgstr "Abilita Trucchi"
|
||||||
|
|
||||||
|
|
@ -2108,6 +2180,7 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Fine"
|
msgstr "Fine"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
|
@ -2117,6 +2190,11 @@ msgstr "Fine"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "English"
|
||||||
msgstr "Inglese"
|
msgstr "Inglese"
|
||||||
|
|
||||||
|
|
@ -2146,6 +2224,7 @@ msgstr "Uguale"
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Errore/i"
|
msgstr "Errore/i"
|
||||||
|
|
@ -2163,6 +2242,19 @@ msgid "Error"
|
||||||
msgstr "Errore/i"
|
msgstr "Errore/i"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Errore/i"
|
||||||
|
|
||||||
|
#: 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
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2627,6 +2719,7 @@ msgstr "Fotogrammi da Registrare:"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Visuale Libera"
|
msgstr "Visuale Libera"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
|
@ -2636,6 +2729,11 @@ msgstr "Visuale Libera"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "French"
|
||||||
msgstr "Francese"
|
msgstr "Francese"
|
||||||
|
|
||||||
|
|
@ -2704,10 +2802,14 @@ msgstr "Impostazioni &Controlli GameCube"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Schede di Memoria GameCube (*.raw,*.gcp)"
|
msgstr "Schede di Memoria GameCube (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2731,11 +2833,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Generale"
|
msgstr "Generale"
|
||||||
|
|
@ -2745,6 +2852,7 @@ msgstr "Generale"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Impostazioni Interfaccia"
|
msgstr "Impostazioni Interfaccia"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
|
@ -2754,6 +2862,11 @@ msgstr "Impostazioni Interfaccia"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "German"
|
||||||
msgstr "Tedesco"
|
msgstr "Tedesco"
|
||||||
|
|
||||||
|
|
@ -2879,11 +2992,16 @@ msgstr "Configurazione Tasti di Scelta Rapida"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Hotkeys"
|
||||||
msgstr "Tasti di Scelta Rapida"
|
msgstr "Tasti di Scelta Rapida"
|
||||||
|
|
||||||
|
|
@ -3097,11 +3215,15 @@ msgstr ""
|
||||||
"E' stata sollevata un'Eccezione all'Installazione, tuttavia questa "
|
"E' stata sollevata un'Eccezione all'Installazione, tuttavia questa "
|
||||||
"piattaforma non la supporta ancora."
|
"piattaforma non la supporta ancora."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "Installazione WAD..."
|
msgstr "Installazione WAD..."
|
||||||
|
|
||||||
|
|
@ -3185,6 +3307,7 @@ msgstr "File di registrazione non valido"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Stato non valido"
|
msgstr "Stato non valido"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
|
@ -3194,6 +3317,11 @@ msgstr "Stato non valido"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Italian"
|
||||||
msgstr "Italiano"
|
msgstr "Italiano"
|
||||||
|
|
||||||
|
|
@ -3352,20 +3480,28 @@ msgstr "Carica Stato di Gioco dall'Ingresso 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Carica Stato di Gioco..."
|
msgstr "Carica Stato di Gioco..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Carica il Menu di Sistema Wii %d%c"
|
msgstr "Carica il Menu di Sistema Wii %d%c"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Carica il Menu di Sistema Wii %d%c"
|
msgstr "Carica il Menu di Sistema Wii %d%c"
|
||||||
|
|
@ -3448,11 +3584,15 @@ msgstr "Hack Velocità MMU"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "File MadCatz Gameshark(*.gcs)"
|
msgstr "File MadCatz Gameshark(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Levetta Principale"
|
msgstr "Levetta Principale"
|
||||||
|
|
@ -3484,10 +3624,14 @@ msgstr "Byte"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Scheda di Memoria"
|
msgstr "Scheda di Memoria"
|
||||||
|
|
||||||
|
|
@ -3673,11 +3817,15 @@ msgstr "TN Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "TN Su"
|
msgstr "TN Su"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3764,11 +3912,15 @@ msgstr "Diverso"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Non Impostato"
|
msgstr "Non Impostato"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Non collegato"
|
msgstr "Non collegato"
|
||||||
|
|
||||||
|
|
@ -3830,9 +3982,13 @@ msgstr "Solo %d blocchi disponibili"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Apri"
|
msgstr "Apri"
|
||||||
|
|
||||||
|
|
@ -3966,6 +4122,7 @@ msgstr "Patches"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Percorsi"
|
msgstr "Percorsi"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
|
@ -3973,6 +4130,10 @@ msgstr "Percorsi"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pausa"
|
msgstr "Pausa"
|
||||||
|
|
@ -3994,12 +4155,17 @@ msgstr "Prospettiva %d"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Play"
|
||||||
msgstr "Gioca"
|
msgstr "Gioca"
|
||||||
|
|
||||||
|
|
@ -4025,11 +4191,15 @@ msgstr "Opzioni di Riproduzione"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Giocatori"
|
msgstr "Giocatori"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Per favore confermare..."
|
msgstr "Per favore confermare..."
|
||||||
|
|
||||||
|
|
@ -4243,6 +4413,7 @@ msgstr "Aggiorna Elenco"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Aggiorna elenco giochi"
|
msgstr "Aggiorna elenco giochi"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
|
|
@ -4254,6 +4425,12 @@ msgstr "Aggiorna elenco giochi"
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Remove"
|
||||||
msgstr "Rimuovi"
|
msgstr "Rimuovi"
|
||||||
|
|
||||||
|
|
@ -4273,9 +4450,13 @@ msgstr "Rendering nella finestra Principale"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Resetta"
|
msgstr "Resetta"
|
||||||
|
|
@ -4318,11 +4499,15 @@ msgstr "Sa&lva Stato di Gioco"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Accurata"
|
msgstr "Accurata"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Frequenza di Campionamento:"
|
msgstr "Frequenza di Campionamento:"
|
||||||
|
|
||||||
|
|
@ -4407,11 +4592,15 @@ msgstr "Il salvataggio del filmato %s è corrotto, arresto registrazione..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "Scala Copie EFB"
|
msgstr "Scala Copie EFB"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Ricerca..."
|
msgstr "Ricerca..."
|
||||||
|
|
@ -4451,6 +4640,7 @@ msgstr "Sezione %s non trovata in SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Seleziona"
|
msgstr "Seleziona"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
|
|
@ -4466,6 +4656,14 @@ msgstr "Seleziona il File di Registrazione"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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 "Seleziona il File di Registrazione"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Seleziona un file WAD Wii da installare"
|
msgstr "Seleziona un file WAD Wii da installare"
|
||||||
|
|
||||||
|
|
@ -4491,6 +4689,7 @@ msgstr "Seleziona finestre libere/mobili"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Seleziona il file da caricare"
|
msgstr "Seleziona il file da caricare"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
|
|
@ -4503,15 +4702,22 @@ msgstr "Seleziona lo stato di gioco da caricare"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Seleziona il file di salvataggio"
|
msgstr "Seleziona il file di salvataggio"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
msgid "Select the state to load"
|
msgid "Select the state to load"
|
||||||
msgstr "Seleziona lo stato di gioco da caricare"
|
msgstr "Seleziona lo stato di gioco da caricare"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Select the state to save"
|
||||||
msgstr "Seleziona lo stato di gioco da salvare"
|
msgstr "Seleziona lo stato di gioco da salvare"
|
||||||
|
|
||||||
|
|
@ -4866,6 +5072,7 @@ msgstr "Creazione buffer audio non riuscita: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Spazio"
|
msgstr "Spazio"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
|
@ -4875,6 +5082,11 @@ msgstr "Spazio"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Spanish"
|
||||||
msgstr "Spagnolo"
|
msgstr "Spagnolo"
|
||||||
|
|
||||||
|
|
@ -4910,11 +5122,15 @@ msgstr "Levetta Quadrata"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "Controller Standard"
|
msgstr "Controller Standard"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4950,9 +5166,13 @@ msgstr "Levetta"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Arresta"
|
msgstr "Arresta"
|
||||||
|
|
@ -5026,9 +5246,13 @@ msgstr "Semipiano destro"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Genera un'Istantanea di Gioco"
|
msgstr "Genera un'Istantanea di Gioco"
|
||||||
|
|
||||||
|
|
@ -5274,18 +5498,26 @@ msgstr "Seleziona/Deseleziona tutti i Tipi di Log"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Commuta a Schermo Intero"
|
msgstr "Commuta a Schermo Intero"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Sopra"
|
msgstr "Sopra"
|
||||||
|
|
||||||
|
|
@ -5391,6 +5623,7 @@ msgstr ""
|
||||||
"Messaggio sconosciuto avente id:%d ricevuto dal giocatore:%d Giocatore "
|
"Messaggio sconosciuto avente id:%d ricevuto dal giocatore:%d Giocatore "
|
||||||
"espluso!!"
|
"espluso!!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
|
@ -5403,6 +5636,8 @@ msgstr ""
|
||||||
"Continuare?"
|
"Continuare?"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5615,11 +5850,15 @@ msgstr "Origine DVD:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Importa Salvataggi Wii"
|
msgstr "Importa Salvataggi Wii"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Salva i file Wii (*.bin)|*.bin"
|
msgstr "Salva i file Wii (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5650,11 +5889,15 @@ msgstr ""
|
||||||
" o forse è dovuto ad altri motivi. \n"
|
" o forse è dovuto ad altri motivi. \n"
|
||||||
"Vuoi riconnettersi immediatamente?"
|
"Vuoi riconnettersi immediatamente?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote Collegato"
|
msgstr "Wiimote Collegato"
|
||||||
|
|
||||||
|
|
@ -5687,6 +5930,7 @@ msgstr "Windows Destro"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Adatta Testo"
|
msgstr "Adatta Testo"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
|
|
@ -5696,6 +5940,11 @@ msgstr "Adatta Testo"
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Working..."
|
||||||
msgstr "Attività in corso..."
|
msgstr "Attività in corso..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
"PO-Revision-Date: 2011-10-12 20:45+0900\n"
|
"PO-Revision-Date: 2011-10-12 20:45+0900\n"
|
||||||
=======
|
=======
|
||||||
|
|
@ -16,6 +17,9 @@ msgstr ""
|
||||||
"PO-Revision-Date: 2011-08-19 08:37-0500\n"
|
"PO-Revision-Date: 2011-08-19 08:37-0500\n"
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
=======
|
=======
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
"PO-Revision-Date: 2011-10-12 20:45+0900\n"
|
"PO-Revision-Date: 2011-10-12 20:45+0900\n"
|
||||||
>>>>>>> Update Arabic and Japanese translations.
|
>>>>>>> Update Arabic and Japanese translations.
|
||||||
"Last-Translator: DanbSky\n"
|
"Last-Translator: DanbSky\n"
|
||||||
|
|
@ -566,6 +570,7 @@ msgstr "パッチを追加"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
|
|
@ -575,6 +580,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Add..."
|
||||||
msgstr "追加"
|
msgstr "追加"
|
||||||
|
|
||||||
|
|
@ -640,6 +650,7 @@ msgstr "全ての GC/Wii イメージ (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "GC GCMファイル (gcm)|*.gcm"
|
msgstr "GC GCMファイル (gcm)|*.gcm"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
|
@ -647,6 +658,10 @@ msgstr "GC GCMファイル (gcm)|*.gcm"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "全てのステートセーブファイル (sav, s##)"
|
msgstr "全てのステートセーブファイル (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -745,11 +760,15 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr "このタイトルの実体ファイルを削除しますか？元に戻すことはできません！"
|
msgstr "このタイトルの実体ファイルを削除しますか？元に戻すことはできません！"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "アスペクト比："
|
msgstr "アスペクト比："
|
||||||
|
|
@ -770,11 +789,15 @@ msgstr "出力API (Audio Backend)"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Error opening AO device.\n"
|
msgstr "AudioCommon: Error opening AO device.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "自動"
|
msgstr "自動"
|
||||||
|
|
@ -890,10 +913,14 @@ msgstr "青 - 右"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "下部"
|
msgstr "下部"
|
||||||
|
|
||||||
|
|
@ -926,11 +953,15 @@ msgstr "出力先を選択"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "バッファ："
|
msgstr "バッファ："
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1178,10 +1209,14 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "閉じる"
|
msgstr "閉じる"
|
||||||
|
|
@ -1290,11 +1325,15 @@ msgstr "3PのWii リモコンを接続／切断"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "4PのWii リモコンを接続／切断"
|
msgstr "4PのWii リモコンを接続／切断"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "接続中..."
|
msgstr "接続中..."
|
||||||
|
|
||||||
|
|
@ -1486,10 +1525,14 @@ msgstr "DSPエミュレーション方式"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "DSP-HLE エミュレーション (高速)"
|
msgstr "DSP-HLE エミュレーション (高速)"
|
||||||
|
|
||||||
|
|
@ -1720,11 +1763,15 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Divide"
|
msgstr "Divide"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "動作中のゲームを停止しますか？"
|
msgstr "動作中のゲームを停止しますか？"
|
||||||
|
|
||||||
|
|
@ -1753,6 +1800,7 @@ msgstr "Wii リモコンのエミュレーション設定"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin FIFO"
|
msgstr "Dolphin FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
|
@ -1768,6 +1816,14 @@ msgstr "GCコントローラ設定"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "GCコントローラ設定"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Dolphin TAS ムービー (*.dtm)"
|
msgstr "Dolphin TAS ムービー (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1864,6 +1920,7 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"よく分からなければ、チェックを入れないでください。"
|
"よく分からなければ、チェックを入れないでください。"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
|
|
@ -1873,6 +1930,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Dutch"
|
||||||
msgstr "オランダ語"
|
msgstr "オランダ語"
|
||||||
|
|
||||||
|
|
@ -2017,21 +2079,31 @@ msgid "Enable Block Merging"
|
||||||
msgstr "Enable Block Merging"
|
msgstr "Enable Block Merging"
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Enable Cache"
|
msgstr "Enable Cache"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "チートコードを有効化"
|
msgstr "チートコードを有効化"
|
||||||
|
|
||||||
|
|
@ -2185,6 +2257,7 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "End"
|
msgstr "End"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
|
@ -2194,6 +2267,11 @@ msgstr "End"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "English"
|
||||||
msgstr "英語"
|
msgstr "英語"
|
||||||
|
|
||||||
|
|
@ -2223,6 +2301,7 @@ msgstr "に一致する"
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "エラー"
|
msgstr "エラー"
|
||||||
|
|
@ -2240,6 +2319,19 @@ msgid "Error"
|
||||||
msgstr "エラー"
|
msgstr "エラー"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "エラー"
|
||||||
|
|
||||||
|
#: 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
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2698,6 +2790,7 @@ msgstr "録画フレーム数設定"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "フリールック"
|
msgstr "フリールック"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
|
@ -2707,6 +2800,11 @@ msgstr "フリールック"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "French"
|
||||||
msgstr "フランス語"
|
msgstr "フランス語"
|
||||||
|
|
||||||
|
|
@ -2774,10 +2872,14 @@ msgstr "ゲームキューブ入力設定(&P)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp"
|
msgstr "メモリーカードファイル (*.raw,*.gcp)|*.raw;*.gcp"
|
||||||
|
|
||||||
|
|
@ -2801,11 +2903,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "一般"
|
msgstr "一般"
|
||||||
|
|
@ -2814,6 +2921,7 @@ msgstr "一般"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "一般"
|
msgstr "一般"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
|
@ -2823,6 +2931,11 @@ msgstr "一般"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "German"
|
||||||
msgstr "ドイツ語"
|
msgstr "ドイツ語"
|
||||||
|
|
||||||
|
|
@ -2962,11 +3075,16 @@ msgstr "ホットキーの設定"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Hotkeys"
|
||||||
msgstr "ホットキー"
|
msgstr "ホットキー"
|
||||||
|
|
||||||
|
|
@ -3189,11 +3307,15 @@ msgstr ""
|
||||||
"InstallExceptionHandler が呼び出されましたが、このプラットフォームはまだサ"
|
"InstallExceptionHandler が呼び出されましたが、このプラットフォームはまだサ"
|
||||||
"ポートされていません"
|
"ポートされていません"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "WADファイルを追加しています..."
|
msgstr "WADファイルを追加しています..."
|
||||||
|
|
||||||
|
|
@ -3275,6 +3397,7 @@ msgstr "不正な録画ファイル"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "不正なセーブ／ロードファイル"
|
msgstr "不正なセーブ／ロードファイル"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
|
@ -3284,6 +3407,11 @@ msgstr "不正なセーブ／ロードファイル"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Italian"
|
||||||
msgstr "イタリア語"
|
msgstr "イタリア語"
|
||||||
|
|
||||||
|
|
@ -3441,6 +3569,7 @@ msgstr "ステートロード - スロット 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "ファイルからロード"
|
msgstr "ファイルからロード"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
|
|
@ -3454,6 +3583,13 @@ msgstr "Wiiメニューを起動"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "Wiiメニューを起動"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Wiiメニューを起動 ( バージョン：%d %c )"
|
msgstr "Wiiメニューを起動 ( バージョン：%d %c )"
|
||||||
|
|
@ -3536,11 +3672,15 @@ msgstr "MMU Speed Hack"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "MadCatz Gameshark セーブファイル(*.gcs)"
|
msgstr "MadCatz Gameshark セーブファイル(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "コントロールスティック"
|
msgstr "コントロールスティック"
|
||||||
|
|
@ -3572,10 +3712,14 @@ msgstr "メモリバイト"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "メモリーカード"
|
msgstr "メモリーカード"
|
||||||
|
|
||||||
|
|
@ -3771,11 +3915,15 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Up"
|
msgstr "NP Up"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3862,11 +4010,15 @@ msgstr "に一致しない"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "未確認"
|
msgstr "未確認"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "未接続"
|
msgstr "未接続"
|
||||||
|
|
||||||
|
|
@ -3928,9 +4080,13 @@ msgstr "残り %d ブロックしかありません！"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "開く"
|
msgstr "開く"
|
||||||
|
|
||||||
|
|
@ -4061,6 +4217,7 @@ msgstr "パッチ"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "フォルダ"
|
msgstr "フォルダ"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
|
@ -4068,6 +4225,10 @@ msgstr "フォルダ"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "一時停止"
|
msgstr "一時停止"
|
||||||
|
|
@ -4088,12 +4249,17 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Play"
|
||||||
msgstr "開始"
|
msgstr "開始"
|
||||||
|
|
||||||
|
|
@ -4119,11 +4285,15 @@ msgstr "再生オプション"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "プレイヤー一覧"
|
msgstr "プレイヤー一覧"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "確認"
|
msgstr "確認"
|
||||||
|
|
||||||
|
|
@ -4335,6 +4505,7 @@ msgstr "ゲームリストを再更新"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "ゲームリストを再更新します"
|
msgstr "ゲームリストを再更新します"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
|
|
@ -4346,6 +4517,12 @@ msgstr "ゲームリストを再更新します"
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Remove"
|
||||||
msgstr "削除"
|
msgstr "削除"
|
||||||
|
|
||||||
|
|
@ -4365,9 +4542,13 @@ msgstr "メインウィンドウ部分に描画"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "初期化"
|
msgstr "初期化"
|
||||||
|
|
@ -4410,11 +4591,15 @@ msgstr "ステートセーブ(&V)"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Safe"
|
msgstr "Safe"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "サンプルレート"
|
msgstr "サンプルレート"
|
||||||
|
|
||||||
|
|
@ -4498,11 +4683,15 @@ msgstr "Savestate movie %s の破損を確認しました。録画を中止し
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "Scaled EFB Copy"
|
msgstr "Scaled EFB Copy"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "確認中... .%s"
|
msgstr "確認中... .%s"
|
||||||
|
|
@ -4542,6 +4731,7 @@ msgstr "Section %s not found in SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "選択"
|
msgstr "選択"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
|
|
@ -4557,6 +4747,14 @@ msgstr "録画ファイルを選択"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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 "録画ファイルを選択"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "追加するWADファイルを選択"
|
msgstr "追加するWADファイルを選択"
|
||||||
|
|
||||||
|
|
@ -4582,6 +4780,7 @@ msgstr ""
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "ロードするファイルを選択"
|
msgstr "ロードするファイルを選択"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
|
|
@ -4594,15 +4793,22 @@ msgstr "ロードするステートセーブファイルを選択"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "セーブファイルを選択"
|
msgstr "セーブファイルを選択"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
msgid "Select the state to load"
|
msgid "Select the state to load"
|
||||||
msgstr "ロードするステートセーブファイルを選択"
|
msgstr "ロードするステートセーブファイルを選択"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Select the state to save"
|
||||||
msgstr "ステートセーブの保存先を選択"
|
msgstr "ステートセーブの保存先を選択"
|
||||||
|
|
||||||
|
|
@ -4981,6 +5187,7 @@ msgstr "Sound buffer creation failed: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Space"
|
msgstr "Space"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
|
@ -4990,6 +5197,11 @@ msgstr "Space"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Spanish"
|
||||||
msgstr "スペイン語"
|
msgstr "スペイン語"
|
||||||
|
|
||||||
|
|
@ -5033,11 +5245,15 @@ msgstr "丸み"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "標準コントローラ"
|
msgstr "標準コントローラ"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -5073,9 +5289,13 @@ msgstr "スティック"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "停止"
|
msgstr "停止"
|
||||||
|
|
@ -5153,9 +5373,13 @@ msgstr "右テーブル"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "スクリーンショット"
|
msgstr "スクリーンショット"
|
||||||
|
|
||||||
|
|
@ -5407,18 +5631,26 @@ msgstr "全てのログ情報を選択／解除"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "フルスクリーン表示切り替え"
|
msgstr "フルスクリーン表示切り替え"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "上部"
|
msgstr "上部"
|
||||||
|
|
||||||
|
|
@ -5527,6 +5759,7 @@ msgstr "次のIDから不明なメッセージを受信 : %d"
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr "Unknown message with id:%d received from player:%d Kicking player!"
|
msgstr "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
|
@ -5539,6 +5772,8 @@ msgstr ""
|
||||||
"Continue?"
|
"Continue?"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5762,11 +5997,15 @@ msgstr "Wii NANDルート"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Wiiのセーブデータをインポート"
|
msgstr "Wiiのセーブデータをインポート"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Wiiセーブデータ (*.bin)|*.bin"
|
msgstr "Wiiセーブデータ (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5797,11 +6036,15 @@ msgstr ""
|
||||||
"またはしばらく入力がなかったため省電力モードに入ったのかもしれません\n"
|
"またはしばらく入力がなかったため省電力モードに入ったのかもしれません\n"
|
||||||
"再接続しますか？"
|
"再接続しますか？"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wii リモコン接続中"
|
msgstr "Wii リモコン接続中"
|
||||||
|
|
||||||
|
|
@ -5833,6 +6076,7 @@ msgstr "Windows Right"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "ワードラップ"
|
msgstr "ワードラップ"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
|
|
@ -5842,6 +6086,11 @@ msgstr "ワードラップ"
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Working..."
|
||||||
msgstr "動作中..."
|
msgstr "動作中..."
|
||||||
|
|
||||||
|
|
@ -6549,6 +6798,13 @@ msgstr "| (...もしくは)"
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
|
||||||
|
#~ msgid ""
|
||||||
|
#~ "Unknown pointer %#08x\n"
|
||||||
|
#~ "Continue?"
|
||||||
|
#~ msgstr ""
|
||||||
|
#~ "Unknown pointer %#08x\n"
|
||||||
|
#~ "Continue?"
|
||||||
|
|
||||||
#~ msgid "Use FPS For Limiting"
|
#~ msgid "Use FPS For Limiting"
|
||||||
#~ msgstr "有効化"
|
#~ msgstr "有効化"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,10 +8,14 @@ msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
=======
|
=======
|
||||||
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
"PO-Revision-Date: 2011-07-07 10:24+0900\n"
|
"PO-Revision-Date: 2011-07-07 10:24+0900\n"
|
||||||
"Last-Translator: \n"
|
"Last-Translator: \n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
|
|
@ -553,6 +557,7 @@ msgstr "패치 추가"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "새로운 창 추가"
|
msgstr "새로운 창 추가"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
|
|
@ -562,6 +567,11 @@ msgstr "새로운 창 추가"
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Add..."
|
||||||
msgstr "추가..."
|
msgstr "추가..."
|
||||||
|
|
||||||
|
|
@ -629,6 +639,7 @@ msgstr "모든 GC/Wii 이미지들 (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "모든 게임큐브 GCM 파일들 (gcm)"
|
msgstr "모든 게임큐브 GCM 파일들 (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
|
@ -636,6 +647,10 @@ msgstr "모든 게임큐브 GCM 파일들 (gcm)"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "모든 상태들 저장 (sav, s##)"
|
msgstr "모든 상태들 저장 (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -723,11 +738,15 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr "이 파일을 정말로 지우고 싶습니까? 그것은 영원히 사라집니다!"
|
msgstr "이 파일을 정말로 지우고 싶습니까? 그것은 영원히 사라집니다!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "종횡비:"
|
msgstr "종횡비:"
|
||||||
|
|
@ -748,11 +767,15 @@ msgstr "오디오 백엔드:"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: AO 장치를 열기 에러.\n"
|
msgstr "AudioCommon: AO 장치를 열기 에러.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "자동"
|
msgstr "자동"
|
||||||
|
|
@ -868,10 +891,14 @@ msgstr "파랑 오른쪽"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "아래"
|
msgstr "아래"
|
||||||
|
|
||||||
|
|
@ -904,11 +931,15 @@ msgstr "출력 디렉토리 둘러보기"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "버퍼:"
|
msgstr "버퍼:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1150,10 +1181,14 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "닫기"
|
msgstr "닫기"
|
||||||
|
|
@ -1262,11 +1297,15 @@ msgstr "위모트 3 연결"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "위모트 4 연결"
|
msgstr "위모트 4 연결"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "연결중..."
|
msgstr "연결중..."
|
||||||
|
|
||||||
|
|
@ -1458,10 +1497,14 @@ msgstr "DSP 에뮬레이터 엔진"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "DSP HLE 에뮬레이션 (빠름)"
|
msgstr "DSP HLE 에뮬레이션 (빠름)"
|
||||||
|
|
||||||
|
|
@ -1690,11 +1733,15 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "나누기"
|
msgstr "나누기"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "현재 에뮬레이션을 중단하고 싶습니까?"
|
msgstr "현재 에뮬레이션을 중단하고 싶습니까?"
|
||||||
|
|
||||||
|
|
@ -1723,6 +1770,7 @@ msgstr "돌핀 에뮬된 위모트 환경설정"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "돌핀 FIFO"
|
msgstr "돌핀 FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
|
@ -1738,6 +1786,14 @@ msgstr "돌핀 GC패드 환경설정"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "돌핀 GC패드 환경설정"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "돌핀 TAS 동영상 (*.dtm)"
|
msgstr "돌핀 TAS 동영상 (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1833,6 +1889,7 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"확신 없다면, 이것을 언체크로 두세요."
|
"확신 없다면, 이것을 언체크로 두세요."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
|
|
@ -1842,6 +1899,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Dutch"
|
||||||
msgstr "네덜란드어"
|
msgstr "네덜란드어"
|
||||||
|
|
||||||
|
|
@ -1985,21 +2047,31 @@ msgid "Enable Block Merging"
|
||||||
msgstr "블록 합치기 활성"
|
msgstr "블록 합치기 활성"
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "캐쉬 활성"
|
msgstr "캐쉬 활성"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "치트 활성"
|
msgstr "치트 활성"
|
||||||
|
|
||||||
|
|
@ -2150,6 +2222,7 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "끝"
|
msgstr "끝"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
|
@ -2159,6 +2232,11 @@ msgstr "끝"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "English"
|
||||||
msgstr "영어"
|
msgstr "영어"
|
||||||
|
|
||||||
|
|
@ -2188,6 +2266,7 @@ msgstr "같음"
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "에러"
|
msgstr "에러"
|
||||||
|
|
@ -2205,6 +2284,19 @@ msgid "Error"
|
||||||
msgstr "에러"
|
msgstr "에러"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "에러"
|
||||||
|
|
||||||
|
#: 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
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr "선택된 언어 로딩 에러. 시스템 기본으로 돌아갑니다."
|
msgstr "선택된 언어 로딩 에러. 시스템 기본으로 돌아갑니다."
|
||||||
|
|
@ -2659,6 +2751,7 @@ msgstr "녹화할 프레임"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "자유로운 보기"
|
msgstr "자유로운 보기"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
|
@ -2668,6 +2761,11 @@ msgstr "자유로운 보기"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "French"
|
||||||
msgstr "프랑스어"
|
msgstr "프랑스어"
|
||||||
|
|
||||||
|
|
@ -2735,10 +2833,14 @@ msgstr "게임큐브 패드 설정(&P)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "게임큐브 메모리 카드들 (*.raw,*.gcp)"
|
msgstr "게임큐브 메모리 카드들 (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2762,11 +2864,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "일반"
|
msgstr "일반"
|
||||||
|
|
@ -2775,6 +2882,7 @@ msgstr "일반"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "일반 설정"
|
msgstr "일반 설정"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
|
@ -2784,6 +2892,11 @@ msgstr "일반 설정"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "German"
|
||||||
msgstr "독일어"
|
msgstr "독일어"
|
||||||
|
|
||||||
|
|
@ -2914,11 +3027,16 @@ msgstr "단축키 설정"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Hotkeys"
|
||||||
msgstr "단축키들"
|
msgstr "단축키들"
|
||||||
|
|
||||||
|
|
@ -3140,11 +3258,15 @@ msgstr ""
|
||||||
"InstallExceptionHandler 호출됨, 하지만 이 플랫폼은 아직 그것을 지원하지 않습"
|
"InstallExceptionHandler 호출됨, 하지만 이 플랫폼은 아직 그것을 지원하지 않습"
|
||||||
"니다."
|
"니다."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "WAD 설치하기..."
|
msgstr "WAD 설치하기..."
|
||||||
|
|
||||||
|
|
@ -3226,6 +3348,7 @@ msgstr "비적합 기록 파일"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "비적합 상태"
|
msgstr "비적합 상태"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
|
@ -3235,6 +3358,11 @@ msgstr "비적합 상태"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Italian"
|
||||||
msgstr "이탈리아어"
|
msgstr "이탈리아어"
|
||||||
|
|
||||||
|
|
@ -3392,6 +3520,7 @@ msgstr "슬롯8 상태 로드"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "상태 로드..."
|
msgstr "상태 로드..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
|
|
@ -3405,6 +3534,13 @@ msgstr "Wii 시스템 메뉴 로드"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "Wii 시스템 메뉴 로드"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Wii 시스템 메뉴 %d %c 로드"
|
msgstr "Wii 시스템 메뉴 %d %c 로드"
|
||||||
|
|
@ -3486,11 +3622,15 @@ msgstr "MMU 스피드 핵"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "MadCatz 게임샤크 파일들(*.gcs)"
|
msgstr "MadCatz 게임샤크 파일들(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "메인 스틱"
|
msgstr "메인 스틱"
|
||||||
|
|
@ -3522,10 +3662,14 @@ msgstr "메모리 바이트"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "메모리 카드"
|
msgstr "메모리 카드"
|
||||||
|
|
||||||
|
|
@ -3723,11 +3867,15 @@ msgstr "NP 탭"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP 위"
|
msgstr "NP 위"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3814,11 +3962,15 @@ msgstr "같지 않음"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "설정 안함"
|
msgstr "설정 안함"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "연결되지 않음"
|
msgstr "연결되지 않음"
|
||||||
|
|
||||||
|
|
@ -3880,9 +4032,13 @@ msgstr "%d 블럭들만 유용한"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "열기"
|
msgstr "열기"
|
||||||
|
|
||||||
|
|
@ -4010,6 +4166,7 @@ msgstr "패치"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "경로"
|
msgstr "경로"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
|
@ -4017,6 +4174,10 @@ msgstr "경로"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "일시정지"
|
msgstr "일시정지"
|
||||||
|
|
@ -4037,12 +4198,17 @@ msgstr "관점 %d"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Play"
|
||||||
msgstr " 실행 "
|
msgstr " 실행 "
|
||||||
|
|
||||||
|
|
@ -4068,11 +4234,15 @@ msgstr "재생 옵션"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "플레이어"
|
msgstr "플레이어"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "확인해주세요..."
|
msgstr "확인해주세요..."
|
||||||
|
|
||||||
|
|
@ -4284,6 +4454,7 @@ msgstr "목록 새로 고침"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "게임 목록 새로 고침"
|
msgstr "게임 목록 새로 고침"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
|
|
@ -4295,6 +4466,12 @@ msgstr "게임 목록 새로 고침"
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Remove"
|
||||||
msgstr "제거"
|
msgstr "제거"
|
||||||
|
|
||||||
|
|
@ -4314,9 +4491,13 @@ msgstr "메인 윈도우에 렌더"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "리셋"
|
msgstr "리셋"
|
||||||
|
|
@ -4359,11 +4540,15 @@ msgstr "상태 저장(&v) "
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "안전"
|
msgstr "안전"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "샘플율:"
|
msgstr "샘플율:"
|
||||||
|
|
||||||
|
|
@ -4447,11 +4632,15 @@ msgstr "%s 영상 상태저장이 손상되었습니다, 영상 기록 중지...
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "스케일된 EFB 복사"
|
msgstr "스케일된 EFB 복사"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "스캐닝 %s"
|
msgstr "스캐닝 %s"
|
||||||
|
|
@ -4491,6 +4680,7 @@ msgstr "섹션 %s를 SYSCONF에서 찾을 수 없음"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "선택"
|
msgstr "선택"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
|
|
@ -4506,6 +4696,14 @@ msgstr "기록 파일 선택"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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 "기록 파일 선택"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "설치할 Wii WAD 파일 선택"
|
msgstr "설치할 Wii WAD 파일 선택"
|
||||||
|
|
||||||
|
|
@ -4531,6 +4729,7 @@ msgstr "유동적인 윈도우즈 선택"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "로드할 파일 선택"
|
msgstr "로드할 파일 선택"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
|
|
@ -4543,15 +4742,22 @@ msgstr "로드할 상태 선택"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "저장 파일을 선택"
|
msgstr "저장 파일을 선택"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
msgid "Select the state to load"
|
msgid "Select the state to load"
|
||||||
msgstr "로드할 상태 선택"
|
msgstr "로드할 상태 선택"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Select the state to save"
|
||||||
msgstr "저장할 상태 선택"
|
msgstr "저장할 상태 선택"
|
||||||
|
|
||||||
|
|
@ -4926,6 +5132,7 @@ msgstr "사운드 버퍼 생성 실패했습니다: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "스페이스"
|
msgstr "스페이스"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
|
@ -4935,6 +5142,11 @@ msgstr "스페이스"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Spanish"
|
||||||
msgstr "스페인어"
|
msgstr "스페인어"
|
||||||
|
|
||||||
|
|
@ -4978,11 +5190,15 @@ msgstr "스퀘어 스틱"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "표준 컨트롤러"
|
msgstr "표준 컨트롤러"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -5018,9 +5234,13 @@ msgstr "스틱"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "중지"
|
msgstr "중지"
|
||||||
|
|
@ -5097,9 +5317,13 @@ msgstr "테이블 오른쪽"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "스크린샷 찍기"
|
msgstr "스크린샷 찍기"
|
||||||
|
|
||||||
|
|
@ -5342,18 +5566,26 @@ msgstr "모든 로그 타입 토글"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "전체화면 토글"
|
msgstr "전체화면 토글"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "위"
|
msgstr "위"
|
||||||
|
|
||||||
|
|
@ -5461,6 +5693,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"id:%d의 알려지지 않은 메시지, 플레이어:%d 플레이어 킥킹으로 부터 전달된!"
|
"id:%d의 알려지지 않은 메시지, 플레이어:%d 플레이어 킥킹으로 부터 전달된!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
|
@ -5473,6 +5706,8 @@ msgstr ""
|
||||||
"계속합니까?"
|
"계속합니까?"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5694,11 +5929,15 @@ msgstr "Wii NAND 루트:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Wii 저장 가져오기"
|
msgstr "Wii 저장 가져오기"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Wii 저장 파일들 (*.bin)|*.bin"
|
msgstr "Wii 저장 파일들 (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5729,11 +5968,15 @@ msgstr ""
|
||||||
"혹은 아마도 아이들 타임 아웃이거나 다른 원인 때문인 것 같습니다.\n"
|
"혹은 아마도 아이들 타임 아웃이거나 다른 원인 때문인 것 같습니다.\n"
|
||||||
"당신은 즉시 재연결 하고 싶습니까?"
|
"당신은 즉시 재연결 하고 싶습니까?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "위모트가 연결됨"
|
msgstr "위모트가 연결됨"
|
||||||
|
|
||||||
|
|
@ -5766,6 +6009,7 @@ msgstr "윈도우즈 오른쪽"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "자동 줄바꿈"
|
msgstr "자동 줄바꿈"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
|
|
@ -5775,6 +6019,11 @@ msgstr "자동 줄바꿈"
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Working..."
|
||||||
msgstr "작동중..."
|
msgstr "작동중..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,10 +8,14 @@ msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
=======
|
=======
|
||||||
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
"PO-Revision-Date: 2011-06-06 20:15+0100\n"
|
"PO-Revision-Date: 2011-06-06 20:15+0100\n"
|
||||||
"Last-Translator: Knut <e-k-nut@hotmail.com>\n"
|
"Last-Translator: Knut <e-k-nut@hotmail.com>\n"
|
||||||
"Language-Team: Norwegian <e-k-nut@hotmail.com>\n"
|
"Language-Team: Norwegian <e-k-nut@hotmail.com>\n"
|
||||||
|
|
@ -559,6 +563,7 @@ msgstr "Legg til Patch"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Legg til ny rute"
|
msgstr "Legg til ny rute"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
|
|
@ -568,6 +573,11 @@ msgstr "Legg til ny rute"
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Add..."
|
||||||
msgstr "Legg til..."
|
msgstr "Legg til..."
|
||||||
|
|
||||||
|
|
@ -635,6 +645,7 @@ msgstr "Alle GC/Wii-bildefiler (gcm, iso, ciso, wad)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Alle GameCube GCM-filer (gcm)"
|
msgstr "Alle GameCube GCM-filer (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
|
@ -642,6 +653,10 @@ msgstr "Alle GameCube GCM-filer (gcm)"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Alle Save States (sav, s##)"
|
msgstr "Alle Save States (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -733,11 +748,15 @@ msgstr ""
|
||||||
"Er du sikker på at du vil slette denne filen?\n"
|
"Er du sikker på at du vil slette denne filen?\n"
|
||||||
"Den vil bli borte for alltid!"
|
"Den vil bli borte for alltid!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Aspektforhold:"
|
msgstr "Aspektforhold:"
|
||||||
|
|
@ -758,11 +777,15 @@ msgstr "Audio Backend:"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Feil ved åpning av AO-device.\n"
|
msgstr "AudioCommon: Feil ved åpning av AO-device.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Automatisk"
|
msgstr "Automatisk"
|
||||||
|
|
@ -878,10 +901,14 @@ msgstr "Blå Høyre"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Bunn"
|
msgstr "Bunn"
|
||||||
|
|
||||||
|
|
@ -914,11 +941,15 @@ msgstr "Bla etter lagringssted"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Buffer:"
|
msgstr "Buffer:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1162,10 +1193,14 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Lukk"
|
msgstr "Lukk"
|
||||||
|
|
@ -1274,11 +1309,15 @@ msgstr "Koble til Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Koble til Wiimote 4"
|
msgstr "Koble til Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Kobler til..."
|
msgstr "Kobler til..."
|
||||||
|
|
||||||
|
|
@ -1469,10 +1508,14 @@ msgstr "CPU Emulatormotor"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "DSP HLE-emulering (raskt)"
|
msgstr "DSP HLE-emulering (raskt)"
|
||||||
|
|
||||||
|
|
@ -1703,11 +1746,15 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Del"
|
msgstr "Del"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Vil du stoppe pågående emulering?"
|
msgstr "Vil du stoppe pågående emulering?"
|
||||||
|
|
||||||
|
|
@ -1736,6 +1783,7 @@ msgstr "Dolphin Emulert Wiimote Konfigurasjon"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin FIFO"
|
msgstr "Dolphin FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
|
@ -1751,6 +1799,14 @@ msgstr "Dolphin GC-kontroll konfigurasjon"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Dolphin GC-kontroll konfigurasjon"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Dolphin TAS-Filmer (*.dtm)"
|
msgstr "Dolphin TAS-Filmer (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1846,6 +1902,7 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Hvis usikker, la stå avslått."
|
"Hvis usikker, la stå avslått."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
|
|
@ -1855,6 +1912,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Dutch"
|
||||||
msgstr "Nederlansk"
|
msgstr "Nederlansk"
|
||||||
|
|
||||||
|
|
@ -1998,21 +2060,31 @@ msgid "Enable Block Merging"
|
||||||
msgstr "Aktiver Block Merging"
|
msgstr "Aktiver Block Merging"
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Aktiver cache"
|
msgstr "Aktiver cache"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Aktiver Juksekoder"
|
msgstr "Aktiver Juksekoder"
|
||||||
|
|
||||||
|
|
@ -2167,6 +2239,7 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Slutt"
|
msgstr "Slutt"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
|
@ -2176,6 +2249,11 @@ msgstr "Slutt"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "English"
|
||||||
msgstr "Engelsk"
|
msgstr "Engelsk"
|
||||||
|
|
||||||
|
|
@ -2205,6 +2283,7 @@ msgstr "Lik"
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Feil"
|
msgstr "Feil"
|
||||||
|
|
@ -2222,6 +2301,19 @@ msgid "Error"
|
||||||
msgstr "Feil"
|
msgstr "Feil"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Feil"
|
||||||
|
|
||||||
|
#: 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
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr "Feil ved lasting av valgt språk. Faller tilbake til systemstandarden."
|
msgstr "Feil ved lasting av valgt språk. Faller tilbake til systemstandarden."
|
||||||
|
|
@ -2677,6 +2769,7 @@ msgstr "Bilder Til Opptak"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Fri Utkikk"
|
msgstr "Fri Utkikk"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
|
@ -2686,6 +2779,11 @@ msgstr "Fri Utkikk"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "French"
|
||||||
msgstr "Fransk"
|
msgstr "Fransk"
|
||||||
|
|
||||||
|
|
@ -2753,10 +2851,14 @@ msgstr "Innstillinger for &GameCube-kontroll"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "GameCube-minnekort (*.raw,*.gcp)"
|
msgstr "GameCube-minnekort (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2780,11 +2882,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Generelt"
|
msgstr "Generelt"
|
||||||
|
|
@ -2793,6 +2900,7 @@ msgstr "Generelt"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Generelle Innstillinger"
|
msgstr "Generelle Innstillinger"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
|
@ -2802,6 +2910,11 @@ msgstr "Generelle Innstillinger"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "German"
|
||||||
msgstr "Tysk"
|
msgstr "Tysk"
|
||||||
|
|
||||||
|
|
@ -2933,11 +3046,16 @@ msgstr "Konfigurer Snarveistaster"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Hotkeys"
|
||||||
msgstr "Snarveistaster"
|
msgstr "Snarveistaster"
|
||||||
|
|
||||||
|
|
@ -3156,11 +3274,15 @@ msgid ""
|
||||||
"InstallExceptionHandler called, but this platform does not yet support it."
|
"InstallExceptionHandler called, but this platform does not yet support it."
|
||||||
msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke."
|
msgstr "InstallExceptionHandler kalt, men denne plattformen støtter den ikke."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "Installer WAD..."
|
msgstr "Installer WAD..."
|
||||||
|
|
||||||
|
|
@ -3242,6 +3364,7 @@ msgstr "Ugyldig opptaksfil"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Ugyldig save state"
|
msgstr "Ugyldig save state"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
|
@ -3251,6 +3374,11 @@ msgstr "Ugyldig save state"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Italian"
|
||||||
msgstr "Italiensk"
|
msgstr "Italiensk"
|
||||||
|
|
||||||
|
|
@ -3408,6 +3536,7 @@ msgstr "Last Inn Save State Slot 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Last Inn Save State..."
|
msgstr "Last Inn Save State..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
|
|
@ -3421,6 +3550,13 @@ msgstr "Last inn Wii System Meny"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "Last inn Wii System Meny"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Last inn Wii System Meny %d %c"
|
msgstr "Last inn Wii System Meny %d %c"
|
||||||
|
|
@ -3502,11 +3638,15 @@ msgstr "Ytelses-hack for MMU"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "MadCatz Gameshark-filer(*.gcs)"
|
msgstr "MadCatz Gameshark-filer(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Hoved-joystick"
|
msgstr "Hoved-joystick"
|
||||||
|
|
@ -3538,10 +3678,14 @@ msgstr "Memory Byte"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Minnekort"
|
msgstr "Minnekort"
|
||||||
|
|
||||||
|
|
@ -3739,11 +3883,15 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Opp"
|
msgstr "NP Opp"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3830,11 +3978,15 @@ msgstr "Ikke Lik"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Ikke Satt"
|
msgstr "Ikke Satt"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Ikke tilkoblet"
|
msgstr "Ikke tilkoblet"
|
||||||
|
|
||||||
|
|
@ -3896,9 +4048,13 @@ msgstr "Kun %d blokker tilgjengelig"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Åpne"
|
msgstr "Åpne"
|
||||||
|
|
||||||
|
|
@ -4029,6 +4185,7 @@ msgstr "Patcher"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Mappestier"
|
msgstr "Mappestier"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
|
@ -4036,6 +4193,10 @@ msgstr "Mappestier"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pause"
|
msgstr "Pause"
|
||||||
|
|
@ -4056,12 +4217,17 @@ msgstr "Perspektiv %d"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Play"
|
||||||
msgstr "Spill"
|
msgstr "Spill"
|
||||||
|
|
||||||
|
|
@ -4087,11 +4253,15 @@ msgstr "Avspillingsalterntiver"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Spillere"
|
msgstr "Spillere"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Vennligst bekreft..."
|
msgstr "Vennligst bekreft..."
|
||||||
|
|
||||||
|
|
@ -4304,6 +4474,7 @@ msgstr "Oppdater liste"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Oppdater spilliste"
|
msgstr "Oppdater spilliste"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
|
|
@ -4315,6 +4486,12 @@ msgstr "Oppdater spilliste"
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Remove"
|
||||||
msgstr "Fjern"
|
msgstr "Fjern"
|
||||||
|
|
||||||
|
|
@ -4334,9 +4511,13 @@ msgstr "Render til Hovedvindu"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Restart"
|
msgstr "Restart"
|
||||||
|
|
@ -4379,11 +4560,15 @@ msgstr "Lagre Sa&ve State"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Sikker"
|
msgstr "Sikker"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Samplingsratio:"
|
msgstr "Samplingsratio:"
|
||||||
|
|
||||||
|
|
@ -4467,11 +4652,15 @@ msgstr "Save State-film %s er korrupt, opptak avsluttes..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "Skalert EFB-kopi"
|
msgstr "Skalert EFB-kopi"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Søker i %s"
|
msgstr "Søker i %s"
|
||||||
|
|
@ -4511,6 +4700,7 @@ msgstr "Seksjon %s ikke funnet i SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Velg"
|
msgstr "Velg"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
|
|
@ -4526,6 +4716,14 @@ msgstr "Velg Opptaksfil"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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 "Velg Opptaksfil"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Velg en Wii WAD-fil å innstallere"
|
msgstr "Velg en Wii WAD-fil å innstallere"
|
||||||
|
|
||||||
|
|
@ -4551,6 +4749,7 @@ msgstr "Velg flytvindu"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Velg fil å laste"
|
msgstr "Velg fil å laste"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
|
|
@ -4563,15 +4762,22 @@ msgstr "Velg en save state å laste"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Velg lagringsfil"
|
msgstr "Velg lagringsfil"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
msgid "Select the state to load"
|
msgid "Select the state to load"
|
||||||
msgstr "Velg en save state å laste"
|
msgstr "Velg en save state å laste"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Select the state to save"
|
||||||
msgstr "Velg en save state å lagre"
|
msgstr "Velg en save state å lagre"
|
||||||
|
|
||||||
|
|
@ -4948,6 +5154,7 @@ msgstr "Laging av lydbuffer mislyktes: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Mellomrom"
|
msgstr "Mellomrom"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
|
@ -4957,6 +5164,11 @@ msgstr "Mellomrom"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Spanish"
|
||||||
msgstr "Spansk"
|
msgstr "Spansk"
|
||||||
|
|
||||||
|
|
@ -4999,11 +5211,15 @@ msgstr "Kvadrat-joystick"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "Standardkontroller"
|
msgstr "Standardkontroller"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -5039,9 +5255,13 @@ msgstr "Joystick"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Stopp"
|
msgstr "Stopp"
|
||||||
|
|
@ -5120,9 +5340,13 @@ msgstr "Tabell Høyre"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Ta Skjermbilde"
|
msgstr "Ta Skjermbilde"
|
||||||
|
|
||||||
|
|
@ -5366,18 +5590,26 @@ msgstr "Vipp Alle Loggtyper"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Vipp Mellom Vindu/Fullskjerm"
|
msgstr "Vipp Mellom Vindu/Fullskjerm"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Topp"
|
msgstr "Topp"
|
||||||
|
|
||||||
|
|
@ -5484,6 +5716,7 @@ msgstr "Ukjent melding mottatt med ID: %d"
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr "Ukjent melding mottatt med ID: %d fra spiller: %d Sparker spiller!"
|
msgstr "Ukjent melding mottatt med ID: %d fra spiller: %d Sparker spiller!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
|
@ -5496,6 +5729,8 @@ msgstr ""
|
||||||
"Fortsett?"
|
"Fortsett?"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5718,11 +5953,15 @@ msgstr "Wii NAND-rot:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Importer Wii-lagringsfil"
|
msgstr "Importer Wii-lagringsfil"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Wii-lagringsfiler (*.bin)|*.bin"
|
msgstr "Wii-lagringsfiler (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5753,11 +5992,15 @@ msgstr ""
|
||||||
"eller kanskje den koblet seg fra pga. inaktivitet.\n"
|
"eller kanskje den koblet seg fra pga. inaktivitet.\n"
|
||||||
"Vil du koble til igjen øyeblikkelig?"
|
"Vil du koble til igjen øyeblikkelig?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote Tilkoblet"
|
msgstr "Wiimote Tilkoblet"
|
||||||
|
|
||||||
|
|
@ -5790,6 +6033,7 @@ msgstr "Windows Høyre"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Ordkrumning"
|
msgstr "Ordkrumning"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
|
|
@ -5799,6 +6043,11 @@ msgstr "Ordkrumning"
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Working..."
|
||||||
msgstr "Arbeider..."
|
msgstr "Arbeider..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,10 +8,14 @@ msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
=======
|
=======
|
||||||
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
"PO-Revision-Date: 2011-08-07 16:43+0100\n"
|
"PO-Revision-Date: 2011-08-07 16:43+0100\n"
|
||||||
"Last-Translator: Goost <dont_bother@mailing.me>\n"
|
"Last-Translator: Goost <dont_bother@mailing.me>\n"
|
||||||
"Language-Team: DevPro Team. <Dpro.madcreations@gmail.com>\n"
|
"Language-Team: DevPro Team. <Dpro.madcreations@gmail.com>\n"
|
||||||
|
|
@ -560,6 +564,7 @@ msgstr "Voeg Patch toe"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Voeg een nieuwe paneel toe"
|
msgstr "Voeg een nieuwe paneel toe"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
|
|
@ -569,6 +574,11 @@ msgstr "Voeg een nieuwe paneel toe"
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Add..."
|
||||||
msgstr "Voeg toe..."
|
msgstr "Voeg toe..."
|
||||||
|
|
||||||
|
|
@ -636,6 +646,7 @@ msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Alle Gamecube GCM bestanden (gcm)"
|
msgstr "Alle Gamecube GCM bestanden (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
|
@ -643,6 +654,10 @@ msgstr "Alle Gamecube GCM bestanden (gcm)"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Alle Opgeslagen Staten (sav, s##)"
|
msgstr "Alle Opgeslagen Staten (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -733,11 +748,15 @@ msgstr ""
|
||||||
"Weet je zeker dat je dit bestand wilt verwijderen? Deze gegevens zijn niet "
|
"Weet je zeker dat je dit bestand wilt verwijderen? Deze gegevens zijn niet "
|
||||||
"terug te halen!"
|
"terug te halen!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Beeldverhouding:"
|
msgstr "Beeldverhouding:"
|
||||||
|
|
@ -758,11 +777,15 @@ msgstr "Geluid Backend:"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n"
|
msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Auto"
|
msgstr "Auto"
|
||||||
|
|
@ -874,10 +897,14 @@ msgstr "Blauw Rechts"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Onder"
|
msgstr "Onder"
|
||||||
|
|
||||||
|
|
@ -910,11 +937,15 @@ msgstr "Zoek een uitvoer folder"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Buffer:"
|
msgstr "Buffer:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1160,10 +1191,14 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Sluit"
|
msgstr "Sluit"
|
||||||
|
|
@ -1273,11 +1308,15 @@ msgstr "Verbind Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Verbind Wiimote 4"
|
msgstr "Verbind Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Verbinden..."
|
msgstr "Verbinden..."
|
||||||
|
|
||||||
|
|
@ -1469,10 +1508,14 @@ msgstr "DSP Emulator Motor"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "DSP HLE emulatie (snel)"
|
msgstr "DSP HLE emulatie (snel)"
|
||||||
|
|
||||||
|
|
@ -1705,11 +1748,15 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Verdelen"
|
msgstr "Verdelen"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Wil je de emulatie stoppen?"
|
msgstr "Wil je de emulatie stoppen?"
|
||||||
|
|
||||||
|
|
@ -1738,6 +1785,7 @@ msgstr "Dolphin Geëmuleerde Wiimote configuratie"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin FIFO"
|
msgstr "Dolphin FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
|
@ -1753,6 +1801,14 @@ msgstr "Dolphin GCPad Configuratie"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Dolphin GCPad Configuratie"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Dolphin TAS Film (*.dtm)"
|
msgstr "Dolphin TAS Film (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1847,6 +1903,7 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"In geval van twijfel leeg laten."
|
"In geval van twijfel leeg laten."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
|
|
@ -1856,6 +1913,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Dutch"
|
||||||
msgstr "Nederlands"
|
msgstr "Nederlands"
|
||||||
|
|
||||||
|
|
@ -1999,22 +2061,32 @@ msgid "Enable Block Merging"
|
||||||
msgstr "Activeer Block Merging"
|
msgstr "Activeer Block Merging"
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Activeer Cache"
|
msgstr "Activeer Cache"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Activeer Cheats"
|
msgstr "Activeer Cheats"
|
||||||
|
|
||||||
|
|
@ -2170,6 +2242,7 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Einde"
|
msgstr "Einde"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
|
@ -2179,6 +2252,11 @@ msgstr "Einde"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "English"
|
||||||
msgstr "Engels"
|
msgstr "Engels"
|
||||||
|
|
||||||
|
|
@ -2208,6 +2286,7 @@ msgstr "Gelijk"
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Error (Fout)"
|
msgstr "Error (Fout)"
|
||||||
|
|
@ -2225,6 +2304,19 @@ msgid "Error"
|
||||||
msgstr "Error (Fout)"
|
msgstr "Error (Fout)"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Error (Fout)"
|
||||||
|
|
||||||
|
#: 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
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2687,6 +2779,7 @@ msgstr "Frames om op te nemen"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Vrije kijk"
|
msgstr "Vrije kijk"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
|
@ -2696,6 +2789,11 @@ msgstr "Vrije kijk"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "French"
|
||||||
msgstr "Frans"
|
msgstr "Frans"
|
||||||
|
|
||||||
|
|
@ -2764,10 +2862,14 @@ msgstr "Gamecube &Pad Instellingen"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)"
|
msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2791,11 +2893,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Algemeen"
|
msgstr "Algemeen"
|
||||||
|
|
@ -2804,6 +2911,7 @@ msgstr "Algemeen"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Algemene Instellingen"
|
msgstr "Algemene Instellingen"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
|
@ -2813,6 +2921,11 @@ msgstr "Algemene Instellingen"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "German"
|
||||||
msgstr "Duits"
|
msgstr "Duits"
|
||||||
|
|
||||||
|
|
@ -2944,11 +3057,16 @@ msgstr "Sneltoets Configuratie"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Hotkeys"
|
||||||
msgstr "Hotkeys"
|
msgstr "Hotkeys"
|
||||||
|
|
||||||
|
|
@ -3173,11 +3291,15 @@ msgstr ""
|
||||||
"InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog "
|
"InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog "
|
||||||
"niet."
|
"niet."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "WAD aan het installeren..."
|
msgstr "WAD aan het installeren..."
|
||||||
|
|
||||||
|
|
@ -3260,6 +3382,7 @@ msgstr "Onjuist opname bestand"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Onjuiste staat"
|
msgstr "Onjuiste staat"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
|
@ -3269,6 +3392,11 @@ msgstr "Onjuiste staat"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Italian"
|
||||||
msgstr "Italië"
|
msgstr "Italië"
|
||||||
|
|
||||||
|
|
@ -3426,20 +3554,28 @@ msgstr "Laad staat 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Laad staat..."
|
msgstr "Laad staat..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Laad Wii System Menu(%d %c)"
|
msgstr "Laad Wii System Menu(%d %c)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Laad Wii System Menu(%d %c)"
|
msgstr "Laad Wii System Menu(%d %c)"
|
||||||
|
|
@ -3521,11 +3657,15 @@ msgstr "MMU Snelheids Hack"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "MadCatz Gameshark bestanden(*.gcs)"
|
msgstr "MadCatz Gameshark bestanden(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3557,10 +3697,14 @@ msgstr "Geheugen Byte"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Geheugen Kaart"
|
msgstr "Geheugen Kaart"
|
||||||
|
|
||||||
|
|
@ -3759,11 +3903,15 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Omhoog"
|
msgstr "NP Omhoog"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3850,11 +3998,15 @@ msgstr "Niet gelijk"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Niet ingesteld"
|
msgstr "Niet ingesteld"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Niet verbonden"
|
msgstr "Niet verbonden"
|
||||||
|
|
||||||
|
|
@ -3916,9 +4068,13 @@ msgstr "Er zijn maar %d blocks beschikaarr"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Open"
|
msgstr "Open"
|
||||||
|
|
||||||
|
|
@ -4050,6 +4206,7 @@ msgstr "Patches"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Pad"
|
msgstr "Pad"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
|
@ -4057,6 +4214,10 @@ msgstr "Pad"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pauze"
|
msgstr "Pauze"
|
||||||
|
|
@ -4077,12 +4238,17 @@ msgstr "Perspectief %d"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Play"
|
||||||
msgstr "Speel"
|
msgstr "Speel"
|
||||||
|
|
||||||
|
|
@ -4108,11 +4274,15 @@ msgstr "Terugspeel Opties"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Spelers"
|
msgstr "Spelers"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Bevestig alsjeblieft..."
|
msgstr "Bevestig alsjeblieft..."
|
||||||
|
|
||||||
|
|
@ -4325,6 +4495,7 @@ msgstr "Lijst Verversen"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Ververs de speellijst"
|
msgstr "Ververs de speellijst"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
|
|
@ -4336,6 +4507,12 @@ msgstr "Ververs de speellijst"
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Remove"
|
||||||
msgstr "Verwijder"
|
msgstr "Verwijder"
|
||||||
|
|
||||||
|
|
@ -4356,9 +4533,13 @@ msgstr "Geef weer op hoofdscherm"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Opnieuw"
|
msgstr "Opnieuw"
|
||||||
|
|
@ -4401,11 +4582,15 @@ msgstr "S&la Staat Op"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Opslaan"
|
msgstr "Opslaan"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Sample Rate:"
|
msgstr "Sample Rate:"
|
||||||
|
|
||||||
|
|
@ -4490,11 +4675,15 @@ msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "EFB Verkleinde Kopie"
|
msgstr "EFB Verkleinde Kopie"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Scannen van %s"
|
msgstr "Scannen van %s"
|
||||||
|
|
@ -4534,6 +4723,7 @@ msgstr "Sectie %s niet gevonden in SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Selecteer"
|
msgstr "Selecteer"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
|
|
@ -4549,6 +4739,14 @@ msgstr "Selecteer de opname Bestand"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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 "Selecteer de opname Bestand"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Selecteer een Wii WAD bestand om te installeren"
|
msgstr "Selecteer een Wii WAD bestand om te installeren"
|
||||||
|
|
||||||
|
|
@ -4574,6 +4772,7 @@ msgstr "Selecteer zwevende vensters"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Selecteer het bestand om het te laden"
|
msgstr "Selecteer het bestand om het te laden"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
|
|
@ -4586,15 +4785,22 @@ msgstr "Selecteer de Staat om te laden"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Selecteer het save - bestand"
|
msgstr "Selecteer het save - bestand"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
msgid "Select the state to load"
|
msgid "Select the state to load"
|
||||||
msgstr "Selecteer de Staat om te laden"
|
msgstr "Selecteer de Staat om te laden"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Select the state to save"
|
||||||
msgstr "Selecteer de Staat om op te slaan"
|
msgstr "Selecteer de Staat om op te slaan"
|
||||||
|
|
||||||
|
|
@ -4967,6 +5173,7 @@ msgstr "Het aanmaken van de geluids buffer is mislukt: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Ruimte"
|
msgstr "Ruimte"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
|
@ -4976,6 +5183,11 @@ msgstr "Ruimte"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Spanish"
|
||||||
msgstr "Spaans"
|
msgstr "Spaans"
|
||||||
|
|
||||||
|
|
@ -5019,11 +5231,15 @@ msgstr ""
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -5059,9 +5275,13 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Stop"
|
msgstr "Stop"
|
||||||
|
|
@ -5134,9 +5354,13 @@ msgstr "Rechter Tabel"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Neem een Schermafdruk"
|
msgstr "Neem een Schermafdruk"
|
||||||
|
|
||||||
|
|
@ -5383,18 +5607,26 @@ msgstr "Zet Alle Log Types Aan"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Volledig Scherm Inschakelen"
|
msgstr "Volledig Scherm Inschakelen"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Boven"
|
msgstr "Boven"
|
||||||
|
|
||||||
|
|
@ -5504,6 +5736,7 @@ msgstr ""
|
||||||
"Onbekend bericht ontvagen met id : %d ontvangen van speler: %d Speler "
|
"Onbekend bericht ontvagen met id : %d ontvangen van speler: %d Speler "
|
||||||
"eruitgeschopt!"
|
"eruitgeschopt!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
|
@ -5516,6 +5749,8 @@ msgstr ""
|
||||||
"Doorgaan?"
|
"Doorgaan?"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5739,11 +5974,15 @@ msgstr "Wii NAND basismap:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Wii Save Importeren"
|
msgstr "Wii Save Importeren"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Wii save bestanden (*.bin)|*.bin"
|
msgstr "Wii save bestanden (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5774,11 +6013,15 @@ msgstr ""
|
||||||
"of misschien is het te wijten aan een time-out of een andere reden.\n"
|
"of misschien is het te wijten aan een time-out of een andere reden.\n"
|
||||||
"Wilt u meteen opnieuw verbinden?"
|
"Wilt u meteen opnieuw verbinden?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote Connected"
|
msgstr "Wiimote Connected"
|
||||||
|
|
||||||
|
|
@ -5811,6 +6054,7 @@ msgstr "Venster Rechts"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Regelafbreking"
|
msgstr "Regelafbreking"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
|
|
@ -5820,6 +6064,11 @@ msgstr "Regelafbreking"
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Working..."
|
||||||
msgstr "Werken..."
|
msgstr "Werken..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,10 +8,14 @@ msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
=======
|
=======
|
||||||
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
"PO-Revision-Date: 2011-08-12 17:04+0100\n"
|
"PO-Revision-Date: 2011-08-12 17:04+0100\n"
|
||||||
"Last-Translator: Krzysztof Baszczok <baszta2@gmail.com>\n"
|
"Last-Translator: Krzysztof Baszczok <baszta2@gmail.com>\n"
|
||||||
"Language-Team: Polish <baszta2@gmail.com>\n"
|
"Language-Team: Polish <baszta2@gmail.com>\n"
|
||||||
|
|
@ -558,6 +562,7 @@ msgstr "Dodaj łatkę"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Dodaj nowy panel"
|
msgstr "Dodaj nowy panel"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
|
|
@ -567,6 +572,11 @@ msgstr "Dodaj nowy panel"
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Add..."
|
||||||
msgstr "Dodaj..."
|
msgstr "Dodaj..."
|
||||||
|
|
||||||
|
|
@ -634,6 +644,7 @@ msgstr "Wszystkie obrazy GC/Wii (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Pliki GCM"
|
msgstr "Pliki GCM"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
|
@ -641,6 +652,10 @@ msgstr "Pliki GCM"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Stany zapisu (sav, s##)"
|
msgstr "Stany zapisu (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -728,11 +743,15 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr "Czy jesteś pewny by usunąc ten plik? Przepadnie na zawsze!"
|
msgstr "Czy jesteś pewny by usunąc ten plik? Przepadnie na zawsze!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Proporcje ekranu:"
|
msgstr "Proporcje ekranu:"
|
||||||
|
|
@ -753,11 +772,15 @@ msgstr "Audio Backend :"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Błąd otwarcia urządzenia AO.\n"
|
msgstr "AudioCommon: Błąd otwarcia urządzenia AO.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Auto"
|
msgstr "Auto"
|
||||||
|
|
@ -873,10 +896,14 @@ msgstr "Niebieski prawo"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Dół"
|
msgstr "Dół"
|
||||||
|
|
||||||
|
|
@ -909,11 +936,15 @@ msgstr "Szukaj folderu wyjściowego"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Bufor:"
|
msgstr "Bufor:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1114,11 +1145,15 @@ msgstr "Wybierz plik do otwarcia"
|
||||||
msgid "Choose a memory card:"
|
msgid "Choose a memory card:"
|
||||||
msgstr "Wybierz kartę pamięci:"
|
msgstr "Wybierz kartę pamięci:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Choose file to use as apploader: (applies to discs constructed from "
|
"Choose file to use as apploader: (applies to discs constructed from "
|
||||||
"directories only)"
|
"directories only)"
|
||||||
|
|
@ -1161,10 +1196,14 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Zamknij"
|
msgstr "Zamknij"
|
||||||
|
|
@ -1273,11 +1312,15 @@ msgstr "Połącz Wiilot 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Połącz Wiilot 4"
|
msgstr "Połącz Wiilot 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Łączę..."
|
msgstr "Łączę..."
|
||||||
|
|
||||||
|
|
@ -1393,11 +1436,15 @@ msgstr "Utwórz nową perspektywę"
|
||||||
msgid "Created by KDE-Look.org"
|
msgid "Created by KDE-Look.org"
|
||||||
msgstr "Utworzone przez KDE-Look.org"
|
msgstr "Utworzone przez KDE-Look.org"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]"
|
"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1474,10 +1521,14 @@ msgstr "DSP Emulator Engine"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "DSP HLE emulacja (szybkie)"
|
msgstr "DSP HLE emulacja (szybkie)"
|
||||||
|
|
||||||
|
|
@ -1708,11 +1759,15 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Podziel"
|
msgstr "Podziel"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Zatrzymać aktualną emulację?"
|
msgstr "Zatrzymać aktualną emulację?"
|
||||||
|
|
||||||
|
|
@ -1741,6 +1796,7 @@ msgstr "Konfiguracja emulowanego Wiilota"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin FIFO"
|
msgstr "Dolphin FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
|
@ -1756,6 +1812,14 @@ msgstr "Konfiguracja GCPad'a"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Konfiguracja GCPad'a"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Filmy TAS (*.dtm)"
|
msgstr "Filmy TAS (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1767,11 +1831,15 @@ msgstr "Konfiguracja Wiilot'a"
|
||||||
msgid "Dolphin at &Google Code"
|
msgid "Dolphin at &Google Code"
|
||||||
msgstr "Dolphin na &Google Code"
|
msgstr "Dolphin na &Google Code"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for "
|
"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for "
|
||||||
"files..."
|
"files..."
|
||||||
|
|
@ -1779,11 +1847,15 @@ msgstr ""
|
||||||
"Program nie mógł znaleść żadnych obrazów GC/Wii ISO. Kliknij tutaj by "
|
"Program nie mógł znaleść żadnych obrazów GC/Wii ISO. Kliknij tutaj by "
|
||||||
"przeglądać pliki..."
|
"przeglądać pliki..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Dolphin is currently set to hide all games. Doubleclick here to show all "
|
"Dolphin is currently set to hide all games. Doubleclick here to show all "
|
||||||
"games..."
|
"games..."
|
||||||
|
|
@ -1859,6 +1931,7 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"W razie wątpliwości, pozostaw wyłączone."
|
"W razie wątpliwości, pozostaw wyłączone."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
|
|
@ -1868,6 +1941,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Dutch"
|
||||||
msgstr "Holenderski"
|
msgstr "Holenderski"
|
||||||
|
|
||||||
|
|
@ -2012,21 +2090,31 @@ msgid "Enable Block Merging"
|
||||||
msgstr "Włącz łączenie bloków"
|
msgstr "Włącz łączenie bloków"
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Włącz cache"
|
msgstr "Włącz cache"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Włącz kody"
|
msgstr "Włącz kody"
|
||||||
|
|
||||||
|
|
@ -2125,11 +2213,15 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"W razie wątpliwości, pozostaw wyłączone."
|
"W razie wątpliwości, pozostaw wyłączone."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
|
"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
|
||||||
"ANY other game."
|
"ANY other game."
|
||||||
|
|
@ -2185,6 +2277,7 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Koniec"
|
msgstr "Koniec"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
|
@ -2194,6 +2287,11 @@ msgstr "Koniec"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "English"
|
||||||
msgstr "Angielski"
|
msgstr "Angielski"
|
||||||
|
|
||||||
|
|
@ -2223,6 +2321,7 @@ msgstr "Równy"
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Błąd"
|
msgstr "Błąd"
|
||||||
|
|
@ -2240,6 +2339,19 @@ msgid "Error"
|
||||||
msgstr "Błąd"
|
msgstr "Błąd"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Błąd"
|
||||||
|
|
||||||
|
#: 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
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr "Błąd wczytywania wybranego języka. Ustawienia domyślne."
|
msgstr "Błąd wczytywania wybranego języka. Ustawienia domyślne."
|
||||||
|
|
@ -2248,6 +2360,9 @@ msgstr "Błąd wczytywania wybranego języka. Ustawienia domyślne."
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid ""
|
msgid ""
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
|
"Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). "
|
||||||
"Aborting savestate load..."
|
"Aborting savestate load..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2697,6 +2812,7 @@ msgstr "Ramki do nagrania"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Free Look"
|
msgstr "Free Look"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
|
@ -2706,6 +2822,11 @@ msgstr "Free Look"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "French"
|
||||||
msgstr "Francuski"
|
msgstr "Francuski"
|
||||||
|
|
||||||
|
|
@ -2773,10 +2894,14 @@ msgstr "Ustawienia &pada GC"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Karty pamięci GC (*.raw,*.gcp)"
|
msgstr "Karty pamięci GC (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2800,11 +2925,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Główne"
|
msgstr "Główne"
|
||||||
|
|
@ -2813,6 +2943,7 @@ msgstr "Główne"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Ustawienia ogólne"
|
msgstr "Ustawienia ogólne"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
|
@ -2822,6 +2953,11 @@ msgstr "Ustawienia ogólne"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "German"
|
||||||
msgstr "Niemiecki"
|
msgstr "Niemiecki"
|
||||||
|
|
||||||
|
|
@ -2951,11 +3087,16 @@ msgstr "Konfiguracja skrótów klawiszowych"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Hotkeys"
|
||||||
msgstr "Skróty klawiszowe"
|
msgstr "Skróty klawiszowe"
|
||||||
|
|
||||||
|
|
@ -3035,11 +3176,15 @@ msgstr ""
|
||||||
"Jeśli FPS jest niezrównoważony, ta opcja może pomóc. (ON = kompatybilny, OFF "
|
"Jeśli FPS jest niezrównoważony, ta opcja może pomóc. (ON = kompatybilny, OFF "
|
||||||
"= szybko)"
|
"= szybko)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid ""
|
msgid ""
|
||||||
"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you "
|
"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."
|
"also have to disable Audio Throttle in DSP to make it effective."
|
||||||
|
|
@ -3180,11 +3325,15 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"InstallExceptionHandler wywołany, ale ta platforma nie wspiera go jeszcze."
|
"InstallExceptionHandler wywołany, ale ta platforma nie wspiera go jeszcze."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "Instalacja WAD..."
|
msgstr "Instalacja WAD..."
|
||||||
|
|
||||||
|
|
@ -3266,6 +3415,7 @@ msgstr "Newłaściwy plik nagrania"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Niewłaściwy stan"
|
msgstr "Niewłaściwy stan"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
|
@ -3275,6 +3425,11 @@ msgstr "Niewłaściwy stan"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Italian"
|
||||||
msgstr "Włoski"
|
msgstr "Włoski"
|
||||||
|
|
||||||
|
|
@ -3432,6 +3587,7 @@ msgstr "Wczytaj stan Slot 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Wczytaj stan..."
|
msgstr "Wczytaj stan..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
|
|
@ -3445,6 +3601,13 @@ msgstr "Wczytaj Wii System Menu"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "Wczytaj Wii System Menu"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Wczytaj Wii System Menu %d %c"
|
msgstr "Wczytaj Wii System Menu %d %c"
|
||||||
|
|
@ -3526,11 +3689,15 @@ msgstr "MMU Speed Hack"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "Pliki MadCatz Gameshark(*.gcs)"
|
msgstr "Pliki MadCatz Gameshark(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Główna gałka"
|
msgstr "Główna gałka"
|
||||||
|
|
@ -3562,10 +3729,14 @@ msgstr "Bajt pamięci"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Karta pamięci"
|
msgstr "Karta pamięci"
|
||||||
|
|
||||||
|
|
@ -3763,11 +3934,15 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Up"
|
msgstr "NP Up"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3854,11 +4029,15 @@ msgstr "Nie równe"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Nie ustawiono"
|
msgstr "Nie ustawiono"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Nie połączono"
|
msgstr "Nie połączono"
|
||||||
|
|
||||||
|
|
@ -3920,9 +4099,13 @@ msgstr "Dostępnych tylko %d bloków"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Otwórz"
|
msgstr "Otwórz"
|
||||||
|
|
||||||
|
|
@ -4053,6 +4236,7 @@ msgstr "Patche"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Ścieżki"
|
msgstr "Ścieżki"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
|
@ -4060,6 +4244,10 @@ msgstr "Ścieżki"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pause"
|
msgstr "Pause"
|
||||||
|
|
@ -4080,12 +4268,17 @@ msgstr "Perspekrtywa %d"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Play"
|
||||||
msgstr "Play"
|
msgstr "Play"
|
||||||
|
|
||||||
|
|
@ -4111,11 +4304,15 @@ msgstr "Opcje playback'u"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Gracze"
|
msgstr "Gracze"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Potwierdź..."
|
msgstr "Potwierdź..."
|
||||||
|
|
||||||
|
|
@ -4326,6 +4523,7 @@ msgstr "Odśwież listę"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Odśwież listę gier"
|
msgstr "Odśwież listę gier"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
|
|
@ -4337,6 +4535,12 @@ msgstr "Odśwież listę gier"
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Remove"
|
||||||
msgstr "Usuń"
|
msgstr "Usuń"
|
||||||
|
|
||||||
|
|
@ -4356,9 +4560,13 @@ msgstr "Generuj w oknie głównym"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Reset"
|
msgstr "Reset"
|
||||||
|
|
@ -4401,11 +4609,15 @@ msgstr "Zapisz &stan"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Bezpieczny"
|
msgstr "Bezpieczny"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Wskaźnik próbkowania:"
|
msgstr "Wskaźnik próbkowania:"
|
||||||
|
|
||||||
|
|
@ -4489,11 +4701,15 @@ msgstr "Stan zapisu filmu %s jest uszkodzony, nagrywanie zatrzymane..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "Scaled EFB Copy"
|
msgstr "Scaled EFB Copy"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Sknauję %s"
|
msgstr "Sknauję %s"
|
||||||
|
|
@ -4533,6 +4749,7 @@ msgstr "Nie odnaleziono sekcji %s w SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Select"
|
msgstr "Select"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
|
|
@ -4548,6 +4765,14 @@ msgstr "Wybierz plik nagrania"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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 "Wybierz plik nagrania"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Wybierz plik Wii WAD do zainstalowania"
|
msgstr "Wybierz plik Wii WAD do zainstalowania"
|
||||||
|
|
||||||
|
|
@ -4573,6 +4798,7 @@ msgstr "Select floating windows"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Wybierz plik do wczytania"
|
msgstr "Wybierz plik do wczytania"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
|
|
@ -4585,15 +4811,22 @@ msgstr "Wybierz stan do wczytania"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Wybierz plik do zapisu"
|
msgstr "Wybierz plik do zapisu"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
msgid "Select the state to load"
|
msgid "Select the state to load"
|
||||||
msgstr "Wybierz stan do wczytania"
|
msgstr "Wybierz stan do wczytania"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Select the state to save"
|
||||||
msgstr "Wybierz stan do zapisu"
|
msgstr "Wybierz stan do zapisu"
|
||||||
|
|
||||||
|
|
@ -4666,11 +4899,15 @@ msgstr "Separator"
|
||||||
msgid "Serbian"
|
msgid "Serbian"
|
||||||
msgstr "Serbski"
|
msgstr "Serbski"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Serial Port 1 - This is the port which devices such as the net adapter use"
|
"Serial Port 1 - This is the port which devices such as the net adapter use"
|
||||||
msgstr "Serial Port 1 - Port używany przez urządzenia takie jak net adapter"
|
msgstr "Serial Port 1 - Port używany przez urządzenia takie jak net adapter"
|
||||||
|
|
@ -4972,6 +5209,7 @@ msgstr "Utworzenie bufora dźwięku nie powiodło się: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Space"
|
msgstr "Space"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
|
@ -4981,6 +5219,11 @@ msgstr "Space"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Spanish"
|
||||||
msgstr "Hiszpański"
|
msgstr "Hiszpański"
|
||||||
|
|
||||||
|
|
@ -5024,11 +5267,15 @@ msgstr "Square Stick"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "Standard Controller"
|
msgstr "Standard Controller"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -5064,9 +5311,13 @@ msgstr "Gałka"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Stop"
|
msgstr "Stop"
|
||||||
|
|
@ -5144,9 +5395,13 @@ msgstr "Talerz prawo"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Zrób zdjęcie"
|
msgstr "Zrób zdjęcie"
|
||||||
|
|
||||||
|
|
@ -5392,18 +5647,26 @@ msgstr "Przełącz wszystkie typy logów"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Przełącz na pełny ekran"
|
msgstr "Przełącz na pełny ekran"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Góra"
|
msgstr "Góra"
|
||||||
|
|
||||||
|
|
@ -5512,6 +5775,7 @@ msgstr "Nieznana wiadomość o ID: %d"
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr "Nieznana wiadomość o ID: %d od gracza: %d Gracz wylatuje!"
|
msgstr "Nieznana wiadomość o ID: %d od gracza: %d Gracz wylatuje!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
|
@ -5524,6 +5788,8 @@ msgstr ""
|
||||||
"Kontynuować?"
|
"Kontynuować?"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5746,11 +6012,15 @@ msgstr "Źródło Wii NAND:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Import zapisów Wii"
|
msgstr "Import zapisów Wii"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Pliki zapisu Wii (*.bin)|*.bin"
|
msgstr "Pliki zapisu Wii (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5781,11 +6051,15 @@ msgstr ""
|
||||||
"lub zbyt długi czas nieobecności lub coś innego.\n"
|
"lub zbyt długi czas nieobecności lub coś innego.\n"
|
||||||
"Połączyć ponownie?"
|
"Połączyć ponownie?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiilot połączony"
|
msgstr "Wiilot połączony"
|
||||||
|
|
||||||
|
|
@ -5817,6 +6091,7 @@ msgstr "Windows Right"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Zawijanie wierszy"
|
msgstr "Zawijanie wierszy"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
|
|
@ -5826,6 +6101,11 @@ msgstr "Zawijanie wierszy"
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Working..."
|
||||||
msgstr "Pracuję..."
|
msgstr "Pracuję..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,10 +8,14 @@ msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
=======
|
=======
|
||||||
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
"PO-Revision-Date: 2011-07-23 15:53-0000\n"
|
"PO-Revision-Date: 2011-07-23 15:53-0000\n"
|
||||||
"Last-Translator: Zilaan <nunogomesrebelo@hotmail.com>\n"
|
"Last-Translator: Zilaan <nunogomesrebelo@hotmail.com>\n"
|
||||||
"Language-Team: Zilaan <nunogomesrebelo@hotmail.com>\n"
|
"Language-Team: Zilaan <nunogomesrebelo@hotmail.com>\n"
|
||||||
|
|
@ -560,6 +564,7 @@ msgstr "Adicionar Patch"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Adicionar novo painel"
|
msgstr "Adicionar novo painel"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
|
|
@ -569,6 +574,11 @@ msgstr "Adicionar novo painel"
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Add..."
|
||||||
msgstr "Adicionar..."
|
msgstr "Adicionar..."
|
||||||
|
|
||||||
|
|
@ -637,6 +647,7 @@ msgstr "Todas as imagens GC/Wii (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Todos os ficheiros Gamecube GCM (gcm)"
|
msgstr "Todos os ficheiros Gamecube GCM (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
|
@ -644,6 +655,10 @@ msgstr "Todos os ficheiros Gamecube GCM (gcm)"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Todos os Estados Guardados (sav, s##)"
|
msgstr "Todos os Estados Guardados (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -733,11 +748,15 @@ msgstr ""
|
||||||
"Tem a certeza que quer eliminar este ficheiro? Será eliminado "
|
"Tem a certeza que quer eliminar este ficheiro? Será eliminado "
|
||||||
"permanentemente!"
|
"permanentemente!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Proporção de ecrã:"
|
msgstr "Proporção de ecrã:"
|
||||||
|
|
@ -758,11 +777,15 @@ msgstr "Áudio Backend :"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n"
|
msgstr "AudioCommon: Erro ao abrir dispositivo AO.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Automático"
|
msgstr "Automático"
|
||||||
|
|
@ -879,10 +902,14 @@ msgstr "Azul Direita"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Inferior"
|
msgstr "Inferior"
|
||||||
|
|
||||||
|
|
@ -915,11 +942,15 @@ msgstr "Procurar por pasta de destino"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Buffer:"
|
msgstr "Buffer:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1168,10 +1199,14 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Fechar"
|
msgstr "Fechar"
|
||||||
|
|
@ -1280,11 +1315,15 @@ msgstr "Conectar Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Conectar Wiimote 4"
|
msgstr "Conectar Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "A conectar..."
|
msgstr "A conectar..."
|
||||||
|
|
||||||
|
|
@ -1476,10 +1515,14 @@ msgstr "Motor de Emulador DSP"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "Emulação de DSP HLE (rápido)"
|
msgstr "Emulação de DSP HLE (rápido)"
|
||||||
|
|
||||||
|
|
@ -1710,11 +1753,15 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Dividir"
|
msgstr "Dividir"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Deseja parar a emulação actual?"
|
msgstr "Deseja parar a emulação actual?"
|
||||||
|
|
||||||
|
|
@ -1743,6 +1790,7 @@ msgstr "Configuração da emulação de Wiimote"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin FIFO"
|
msgstr "Dolphin FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
|
@ -1758,6 +1806,14 @@ msgstr "Configuração de GCPad "
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Configuração de GCPad "
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Dolphin TAS filmes (*.dtm)"
|
msgstr "Dolphin TAS filmes (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1854,6 +1910,7 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Em caso de dúvida, mantenha esta opção desactivada."
|
"Em caso de dúvida, mantenha esta opção desactivada."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
|
|
@ -1863,6 +1920,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Dutch"
|
||||||
msgstr "Holandês"
|
msgstr "Holandês"
|
||||||
|
|
||||||
|
|
@ -2007,21 +2069,31 @@ msgid "Enable Block Merging"
|
||||||
msgstr "Activar Fusão de blocos"
|
msgstr "Activar Fusão de blocos"
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Activar Cache"
|
msgstr "Activar Cache"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Activar Cheats"
|
msgstr "Activar Cheats"
|
||||||
|
|
||||||
|
|
@ -2177,6 +2249,7 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Fim"
|
msgstr "Fim"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
|
@ -2186,6 +2259,11 @@ msgstr "Fim"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "English"
|
||||||
msgstr "Inglês"
|
msgstr "Inglês"
|
||||||
|
|
||||||
|
|
@ -2215,6 +2293,7 @@ msgstr "Igual"
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Erro"
|
msgstr "Erro"
|
||||||
|
|
@ -2232,6 +2311,19 @@ msgid "Error"
|
||||||
msgstr "Erro"
|
msgstr "Erro"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2692,6 +2784,7 @@ msgstr "Quadros para Gravar"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Vista Livre"
|
msgstr "Vista Livre"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
|
@ -2701,6 +2794,11 @@ msgstr "Vista Livre"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "French"
|
||||||
msgstr "Francês"
|
msgstr "Francês"
|
||||||
|
|
||||||
|
|
@ -2768,10 +2866,14 @@ msgstr "Definições de Comando &Gamecube"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Cartões de memória Gamecube (*.raw,*.gcp)"
|
msgstr "Cartões de memória Gamecube (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2795,11 +2897,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Geral"
|
msgstr "Geral"
|
||||||
|
|
@ -2808,6 +2915,7 @@ msgstr "Geral"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Definições Gerais"
|
msgstr "Definições Gerais"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
|
@ -2817,6 +2925,11 @@ msgstr "Definições Gerais"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "German"
|
||||||
msgstr "Alemão"
|
msgstr "Alemão"
|
||||||
|
|
||||||
|
|
@ -2947,11 +3060,16 @@ msgstr "Configuração de Teclas de atalho"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Hotkeys"
|
||||||
msgstr "Teclas de Atalho"
|
msgstr "Teclas de Atalho"
|
||||||
|
|
||||||
|
|
@ -3175,11 +3293,15 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta."
|
"InstallExceptionHandler chamado, mas esta plataforma ainda não a suporta."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "A Instalar WAD..."
|
msgstr "A Instalar WAD..."
|
||||||
|
|
||||||
|
|
@ -3261,6 +3383,7 @@ msgstr "Ficheiro de Gravação inválido"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Estado Inválido"
|
msgstr "Estado Inválido"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
|
@ -3270,6 +3393,11 @@ msgstr "Estado Inválido"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Italian"
|
||||||
msgstr "Italiano"
|
msgstr "Italiano"
|
||||||
|
|
||||||
|
|
@ -3427,6 +3555,7 @@ msgstr "Carregar Estado Slot 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Carregar Estado..."
|
msgstr "Carregar Estado..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
|
|
@ -3440,6 +3569,13 @@ msgstr "Carregar Sistema de Menu Wii"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
msgid "Load Wii System Menu"
|
||||||
|
msgstr "Carregar Sistema de Menu Wii"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Carregar Sistema de Menu Wii %d%c"
|
msgstr "Carregar Sistema de Menu Wii %d%c"
|
||||||
|
|
@ -3521,11 +3657,15 @@ msgstr "MMU Hack de velocidade"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "ficheiros MadCatz Gameshark(*.gcs)"
|
msgstr "ficheiros MadCatz Gameshark(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Stick Principal"
|
msgstr "Stick Principal"
|
||||||
|
|
@ -3557,10 +3697,14 @@ msgstr "Byte de Memória"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Cartão de memória"
|
msgstr "Cartão de memória"
|
||||||
|
|
||||||
|
|
@ -3759,11 +3903,15 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Cima"
|
msgstr "NP Cima"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3850,11 +3998,15 @@ msgstr "Não igual"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Não definido"
|
msgstr "Não definido"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Não conectado"
|
msgstr "Não conectado"
|
||||||
|
|
||||||
|
|
@ -3916,9 +4068,13 @@ msgstr "Apenas %d blocos disponíveis"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Abrir"
|
msgstr "Abrir"
|
||||||
|
|
||||||
|
|
@ -4049,6 +4205,7 @@ msgstr "Patches"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Caminhos"
|
msgstr "Caminhos"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
|
@ -4056,6 +4213,10 @@ msgstr "Caminhos"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pausa"
|
msgstr "Pausa"
|
||||||
|
|
@ -4076,12 +4237,17 @@ msgstr "Perspectiva %d"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Play"
|
||||||
msgstr "Começar"
|
msgstr "Começar"
|
||||||
|
|
||||||
|
|
@ -4107,11 +4273,15 @@ msgstr "Opções de Reprodução"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Jogadores"
|
msgstr "Jogadores"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Por favor confirme..."
|
msgstr "Por favor confirme..."
|
||||||
|
|
||||||
|
|
@ -4324,6 +4494,7 @@ msgstr "Actualizar Lista"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Actualizar lista de Jogos"
|
msgstr "Actualizar lista de Jogos"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
|
|
@ -4335,6 +4506,12 @@ msgstr "Actualizar lista de Jogos"
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Remove"
|
||||||
msgstr "Remover"
|
msgstr "Remover"
|
||||||
|
|
||||||
|
|
@ -4354,9 +4531,13 @@ msgstr "Renderizar para a Janela Principal"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Reset"
|
msgstr "Reset"
|
||||||
|
|
@ -4399,11 +4580,15 @@ msgstr "Gua&rdar Estado"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Seguro"
|
msgstr "Seguro"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Taxa de Amostragem:"
|
msgstr "Taxa de Amostragem:"
|
||||||
|
|
||||||
|
|
@ -4487,11 +4672,15 @@ msgstr "O filme de Savestate %s está corrupto, gravação de filme a parar..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "Cópia EFB Escalada"
|
msgstr "Cópia EFB Escalada"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "A procurar %s"
|
msgstr "A procurar %s"
|
||||||
|
|
@ -4531,6 +4720,7 @@ msgstr "Selecção %s não encontrada em SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Seleccionar"
|
msgstr "Seleccionar"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
|
|
@ -4546,6 +4736,14 @@ msgstr "Seleccione o Ficheiro de Gravação"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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 "Seleccione o Ficheiro de Gravação"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Seleccione um ficheiro Wii WAD para instalar"
|
msgstr "Seleccione um ficheiro Wii WAD para instalar"
|
||||||
|
|
||||||
|
|
@ -4571,6 +4769,7 @@ msgstr "Seleccionar janelas flutuantes"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Seleccione o ficheiro para carregar"
|
msgstr "Seleccione o ficheiro para carregar"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
|
|
@ -4583,15 +4782,22 @@ msgstr "Seleccione o estado para carregar"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Seleccione o ficheiro de jogo guardado"
|
msgstr "Seleccione o ficheiro de jogo guardado"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
msgid "Select the state to load"
|
msgid "Select the state to load"
|
||||||
msgstr "Seleccione o estado para carregar"
|
msgstr "Seleccione o estado para carregar"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Select the state to save"
|
||||||
msgstr "Seleccione o estado para gravar"
|
msgstr "Seleccione o estado para gravar"
|
||||||
|
|
||||||
|
|
@ -4972,6 +5178,7 @@ msgstr "Criação do buffer de som falhou: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Espaço"
|
msgstr "Espaço"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
|
@ -4981,6 +5188,11 @@ msgstr "Espaço"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Spanish"
|
||||||
msgstr "Espanhol"
|
msgstr "Espanhol"
|
||||||
|
|
||||||
|
|
@ -5024,11 +5236,15 @@ msgstr "Stick quadrado"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "Comando padrão"
|
msgstr "Comando padrão"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -5064,9 +5280,13 @@ msgstr "Stick"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Parar"
|
msgstr "Parar"
|
||||||
|
|
@ -5144,9 +5364,13 @@ msgstr "Table Direita"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Tirar Screenshot"
|
msgstr "Tirar Screenshot"
|
||||||
|
|
||||||
|
|
@ -5398,18 +5622,26 @@ msgstr "Alternar Todos os Tipos de Relatório"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Alternar Ecrã Inteiro"
|
msgstr "Alternar Ecrã Inteiro"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Topo"
|
msgstr "Topo"
|
||||||
|
|
||||||
|
|
@ -5518,6 +5750,7 @@ msgstr ""
|
||||||
"Mensagem desconhecida com a id:%d recebida pelo jogador:%d Excluindo o "
|
"Mensagem desconhecida com a id:%d recebida pelo jogador:%d Excluindo o "
|
||||||
"jogador!"
|
"jogador!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
|
@ -5530,6 +5763,8 @@ msgstr ""
|
||||||
"Continuar?"
|
"Continuar?"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5755,11 +5990,15 @@ msgstr "Raiz de NAND Wii:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Importação de Jogo Guardado Wii"
|
msgstr "Importação de Jogo Guardado Wii"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin"
|
msgstr "Ficheiros de jogo guardado Wii (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5791,11 +6030,15 @@ msgstr ""
|
||||||
"razão.\n"
|
"razão.\n"
|
||||||
"Quer reconectar imediatamente?"
|
"Quer reconectar imediatamente?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote Conectado"
|
msgstr "Wiimote Conectado"
|
||||||
|
|
||||||
|
|
@ -5828,6 +6071,7 @@ msgstr "Janelas Direita"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Moldar o texto"
|
msgstr "Moldar o texto"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
|
|
@ -5837,6 +6081,11 @@ msgstr "Moldar o texto"
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Working..."
|
||||||
msgstr "A trabalhar..."
|
msgstr "A trabalhar..."
|
||||||
|
|
||||||
|
|
@ -6450,6 +6699,9 @@ msgstr "| OU"
|
||||||
#~ msgstr "Começar a janela renderizada em ecrã inteiro"
|
#~ msgstr "Começar a janela renderizada em ecrã inteiro"
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#~ msgid ""
|
#~ msgid ""
|
||||||
#~ "Unknown pointer %#08x\n"
|
#~ "Unknown pointer %#08x\n"
|
||||||
#~ "Continue?"
|
#~ "Continue?"
|
||||||
|
|
@ -6457,8 +6709,11 @@ msgstr "| OU"
|
||||||
#~ "Apontador desconhecido %#08x\n"
|
#~ "Apontador desconhecido %#08x\n"
|
||||||
#~ "Continuar?"
|
#~ "Continuar?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#~ msgid "Use FPS For Limiting"
|
#~ msgid "Use FPS For Limiting"
|
||||||
#~ msgstr "Usar FPS como limitador"
|
#~ msgstr "Usar FPS como limitador"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,17 @@ msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
"PO-Revision-Date: 2011-12-18 13:38-0600\n"
|
"PO-Revision-Date: 2011-12-18 13:38-0600\n"
|
||||||
=======
|
=======
|
||||||
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
"PO-Revision-Date: 2011-09-11 23:35-0300\n"
|
"PO-Revision-Date: 2011-09-11 23:35-0300\n"
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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 <i.am.runo@hotmail.com>\n"
|
"Last-Translator: Runo <i.am.runo@hotmail.com>\n"
|
||||||
"Language-Team: Portuguese (BR) <dolphinbrtrans@gmail.com>\n"
|
"Language-Team: Portuguese (BR) <dolphinbrtrans@gmail.com>\n"
|
||||||
"Language: \n"
|
"Language: \n"
|
||||||
|
|
@ -563,6 +568,7 @@ msgstr "Adicionar Patch"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Adicionar novo painél"
|
msgstr "Adicionar novo painél"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: 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/ISOProperties.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Add..."
|
||||||
msgstr "Adicionar..."
|
msgstr "Adicionar..."
|
||||||
|
|
||||||
|
|
@ -639,6 +650,7 @@ msgstr "Todas as imagens CG/Wii (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Todos os arquivos Gamecube CGM (gcm)"
|
msgstr "Todos os arquivos Gamecube CGM (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: 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:1459
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Todos os Pontos de Jogo Salvos (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 "
|
"Você tem certeza que quer deletar este arquivo? Ele ficará perdido para "
|
||||||
"sempre!"
|
"sempre!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Proporção:"
|
msgstr "Proporção:"
|
||||||
|
|
@ -760,11 +780,15 @@ msgstr "Backend de Audio"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n"
|
msgstr "AudioCommon: Erro ao abrir o dispositivo AO.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Automático"
|
msgstr "Automático"
|
||||||
|
|
@ -881,10 +905,14 @@ msgstr "Azul Direito"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Embaixo"
|
msgstr "Embaixo"
|
||||||
|
|
||||||
|
|
@ -917,11 +945,15 @@ msgstr "Procurar por um diretório de saída"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Buffer:"
|
msgstr "Buffer:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1126,11 +1158,15 @@ msgstr "Escolher um arquivo para abrir"
|
||||||
msgid "Choose a memory card:"
|
msgid "Choose a memory card:"
|
||||||
msgstr "Escolher um cartão de memória:"
|
msgstr "Escolher um cartão de memória:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:755
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:759
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Choose file to use as apploader: (applies to discs constructed from "
|
"Choose file to use as apploader: (applies to discs constructed from "
|
||||||
"directories only)"
|
"directories only)"
|
||||||
|
|
@ -1173,10 +1209,14 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Fechar"
|
msgstr "Fechar"
|
||||||
|
|
@ -1285,11 +1325,15 @@ msgstr "Conectar Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Conectar Wiimote 4"
|
msgstr "Conectar Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Conectando..."
|
msgstr "Conectando..."
|
||||||
|
|
||||||
|
|
@ -1406,11 +1450,15 @@ msgstr "Criar nova perspectiva"
|
||||||
msgid "Created by KDE-Look.org"
|
msgid "Created by KDE-Look.org"
|
||||||
msgstr "Criado por KDE-Look.org"
|
msgstr "Criado por KDE-Look.org"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:491
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:495
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]"
|
"Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -1485,10 +1533,14 @@ msgstr "Engine de Emulação do DSP"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "Emulação HLE do DSP (rápido)"
|
msgstr "Emulação HLE do DSP (rápido)"
|
||||||
|
|
||||||
|
|
@ -1719,11 +1771,15 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Dividir"
|
msgstr "Dividir"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Você quer parar a emulação atual?"
|
msgstr "Você quer parar a emulação atual?"
|
||||||
|
|
||||||
|
|
@ -1752,6 +1808,7 @@ msgstr "Configuração de Wiimote Emulado do Dolphin"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin FIFO"
|
msgstr "Dolphin FIFO"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
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:742
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Filmes TAS Dolphin (*.dtm)"
|
msgstr "Filmes TAS Dolphin (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1778,11 +1843,15 @@ msgstr "Configuração de Wiimote Dolphin"
|
||||||
msgid "Dolphin at &Google Code"
|
msgid "Dolphin at &Google Code"
|
||||||
msgstr "Dolphin no &Google Code"
|
msgstr "Dolphin no &Google Code"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:303
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:339
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for "
|
"Dolphin could not find any GC/Wii ISOs. Doubleclick here to browse for "
|
||||||
"files..."
|
"files..."
|
||||||
|
|
@ -1790,11 +1859,15 @@ msgstr ""
|
||||||
"Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por "
|
"Dolphin não pôde encontrar ISOs GC/Wii. Duplo-clique aqui para procurar por "
|
||||||
"arquivos..."
|
"arquivos..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:307
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:343
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Dolphin is currently set to hide all games. Doubleclick here to show all "
|
"Dolphin is currently set to hide all games. Doubleclick here to show all "
|
||||||
"games..."
|
"games..."
|
||||||
|
|
@ -1870,6 +1943,7 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Se estiver em dúvida, deixe isto desativado."
|
"Se estiver em dúvida, deixe isto desativado."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: 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:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Dutch"
|
||||||
msgstr "Holandês"
|
msgstr "Holandês"
|
||||||
|
|
||||||
|
|
@ -2023,21 +2102,31 @@ msgid "Enable Block Merging"
|
||||||
msgstr "Ativar Block Merging"
|
msgstr "Ativar Block Merging"
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "Ativar Cache"
|
msgstr "Ativar Cache"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Ativar Cheats"
|
msgstr "Ativar Cheats"
|
||||||
|
|
||||||
|
|
@ -2137,11 +2226,15 @@ msgstr ""
|
||||||
"\n"
|
"\n"
|
||||||
"Se estiver em dúvida, deixe isto desativado."
|
"Se estiver em dúvida, deixe isto desativado."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:329
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:332
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
|
"Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for "
|
||||||
"ANY other game."
|
"ANY other game."
|
||||||
|
|
@ -2197,6 +2290,7 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Fim"
|
msgstr "Fim"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: 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:262
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "English"
|
||||||
msgstr "Inglês"
|
msgstr "Inglês"
|
||||||
|
|
||||||
|
|
@ -2235,6 +2334,7 @@ msgstr "Igual"
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Erro"
|
msgstr "Erro"
|
||||||
|
|
@ -2252,11 +2352,34 @@ msgid "Error"
|
||||||
msgstr "Erro"
|
msgstr "Erro"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema."
|
msgstr "Erro ao carregar o idioma selecionado. Voltando ao padrão do sistema."
|
||||||
|
|
||||||
#: Source/Core/Common/Src/ChunkFile.h:180
|
#: 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
|
#, c-format
|
||||||
msgid ""
|
msgid ""
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
|
@ -2711,6 +2834,7 @@ msgstr "QUadros para Capturar"
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Olhar Livre"
|
msgstr "Olhar Livre"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: 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:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "French"
|
||||||
msgstr "Francês"
|
msgstr "Francês"
|
||||||
|
|
||||||
|
|
@ -2787,10 +2916,14 @@ msgstr "Configurações de &Controle de Gamecube"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Memory Cards do Gamecube (*.raw,*.gcp)"
|
msgstr "Memory Cards do Gamecube (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2814,11 +2947,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Geral"
|
msgstr "Geral"
|
||||||
|
|
@ -2827,6 +2965,7 @@ msgstr "Geral"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Configurações Gerais"
|
msgstr "Configurações Gerais"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: 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:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "German"
|
||||||
msgstr "Alemão"
|
msgstr "Alemão"
|
||||||
|
|
||||||
|
|
@ -2967,11 +3111,16 @@ msgstr "Configuração de hotkey"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Hotkeys"
|
||||||
msgstr "Hotkeys"
|
msgstr "Hotkeys"
|
||||||
|
|
||||||
|
|
@ -3051,11 +3200,15 @@ msgstr ""
|
||||||
"Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = Compatível, "
|
"Se a taxa de FPS estiver instável, esta opção pode ajudar. (ON = Compatível, "
|
||||||
"OFF = Rápido)"
|
"OFF = Rápido)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:481
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:485
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid ""
|
msgid ""
|
||||||
"If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you "
|
"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."
|
"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 "
|
"InstallExceptionHandler foi chamado, mas esta plataforma ainda não tem "
|
||||||
"suporte a ele."
|
"suporte a ele."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "Instalando WAD..."
|
msgstr "Instalando WAD..."
|
||||||
|
|
||||||
|
|
@ -3285,6 +3442,7 @@ msgstr "Arquivo de gravação inválido"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Estado Salvo Inválido"
|
msgstr "Estado Salvo Inválido"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: 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:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Italian"
|
||||||
msgstr "Italiano"
|
msgstr "Italiano"
|
||||||
|
|
||||||
|
|
@ -3451,6 +3614,7 @@ msgstr "Carregar Estado do Slot 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Carregar State..."
|
msgstr "Carregar State..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
|
|
@ -3464,6 +3628,13 @@ msgstr "Carregar Menu de Sistema do Wii"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Carregar Menu de Sistema do Wii %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)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "Arquivos de Gameshark MadCatz(*.gcs)"
|
msgstr "Arquivos de Gameshark MadCatz(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "Analógico Principal"
|
msgstr "Analógico Principal"
|
||||||
|
|
@ -3582,10 +3757,14 @@ msgstr "Byte de Memória"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Cartão de memoria"
|
msgstr "Cartão de memoria"
|
||||||
|
|
||||||
|
|
@ -3784,11 +3963,15 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Cima"
|
msgstr "NP Cima"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3875,11 +4058,15 @@ msgstr "Não igual"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Indefinido"
|
msgstr "Indefinido"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Não conectado"
|
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/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Abrir"
|
msgstr "Abrir"
|
||||||
|
|
||||||
|
|
@ -4074,6 +4265,7 @@ msgstr "Patches"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Diretórios"
|
msgstr "Diretórios"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: 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:1605
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pausar"
|
msgstr "Pausar"
|
||||||
|
|
@ -4101,12 +4297,17 @@ msgstr "Perspectiva %d"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Play"
|
||||||
msgstr "Executar"
|
msgstr "Executar"
|
||||||
|
|
||||||
|
|
@ -4132,11 +4333,15 @@ msgstr "Opções de Reprodução"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "Jogadores"
|
msgstr "Jogadores"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "Favor confirmar..."
|
msgstr "Favor confirmar..."
|
||||||
|
|
||||||
|
|
@ -4347,6 +4552,7 @@ msgstr "Atualizar Lista"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Atualizar a lista de jogos"
|
msgstr "Atualizar a lista de jogos"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: 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/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Remove"
|
||||||
msgstr "Remover"
|
msgstr "Remover"
|
||||||
|
|
||||||
|
|
@ -4377,9 +4589,13 @@ msgstr "Renderizar na Janela Principal"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Reiniciar"
|
msgstr "Reiniciar"
|
||||||
|
|
@ -4422,11 +4638,15 @@ msgstr "Sal&var estado atual"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Seguro"
|
msgstr "Seguro"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Taxa de Amostragem:"
|
msgstr "Taxa de Amostragem:"
|
||||||
|
|
||||||
|
|
@ -4510,11 +4730,15 @@ msgstr "O Estado Salvo capturado %s está corrompido, parando captura..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "Cópia Escalada do EFB"
|
msgstr "Cópia Escalada do EFB"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Escaneando %s"
|
msgstr "Escaneando %s"
|
||||||
|
|
@ -4554,6 +4778,7 @@ msgstr "A seção %s não foi encontrada no SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Selecionar"
|
msgstr "Selecionar"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: 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
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Selecione um arquivo WAD de Wii para instalar"
|
msgstr "Selecione um arquivo WAD de Wii para instalar"
|
||||||
|
|
||||||
|
|
@ -4593,6 +4826,7 @@ msgstr "Selecionar Janelas flutuantes"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Selecione um arquivo para carregar"
|
msgstr "Selecione um arquivo para carregar"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
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:1487
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Selecione o arquivo de salva"
|
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"
|
msgid "Select the state to load"
|
||||||
msgstr "Selecione um estado para carregar"
|
msgstr "Selecione um estado para carregar"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Select the state to save"
|
||||||
msgstr "Selecione um estado para salvar"
|
msgstr "Selecione um estado para salvar"
|
||||||
|
|
||||||
|
|
@ -4687,11 +4928,15 @@ msgstr "Separador"
|
||||||
msgid "Serbian"
|
msgid "Serbian"
|
||||||
msgstr "Sérvio"
|
msgstr "Sérvio"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:506
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:510
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid ""
|
msgid ""
|
||||||
"Serial Port 1 - This is the port which devices such as the net adapter use"
|
"Serial Port 1 - This is the port which devices such as the net adapter use"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -4998,6 +5243,7 @@ msgstr "Falha na criação do buffer de som: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Barra de Espaço"
|
msgstr "Barra de Espaço"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: 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:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Spanish"
|
||||||
msgstr "Espanhol"
|
msgstr "Espanhol"
|
||||||
|
|
||||||
|
|
@ -5050,11 +5301,15 @@ msgstr "Analógico Quadrado"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "Controle Padrão"
|
msgstr "Controle Padrão"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -5090,9 +5345,13 @@ msgstr "Analógico"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Parar"
|
msgstr "Parar"
|
||||||
|
|
@ -5170,9 +5429,13 @@ msgstr "Direita da Mesa"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Capturar Tela"
|
msgstr "Capturar Tela"
|
||||||
|
|
||||||
|
|
@ -5421,18 +5684,26 @@ msgstr "Ligar/Desligar Todos os Logs"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Ir para Tela Cheia"
|
msgstr "Ir para Tela Cheia"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "Topo"
|
msgstr "Topo"
|
||||||
|
|
||||||
|
|
@ -5545,6 +5816,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!"
|
"Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid ""
|
msgid ""
|
||||||
|
|
@ -5554,6 +5826,8 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!"
|
"Menssagem desconhecida com ID:%d recebida do jogador:%d Expulsando jogador!"
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5779,11 +6053,15 @@ msgstr "Raiz do Wii NAND"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Importar Save de Wii"
|
msgstr "Importar Save de Wii"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Arquivos de Salva do Wii (*.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"
|
"ou talvez tenha sido pelo tempo parado ou por outra razão.\n"
|
||||||
"Você quer reconectar imediatamente?"
|
"Você quer reconectar imediatamente?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote Conectado"
|
msgstr "Wiimote Conectado"
|
||||||
|
|
||||||
|
|
@ -5850,6 +6132,7 @@ msgstr "Janelas da Direita"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Word Wrap"
|
msgstr "Word Wrap"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: 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:1194
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Working..."
|
||||||
msgstr "Funcionando..."
|
msgstr "Funcionando..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,10 +8,14 @@ msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
=======
|
=======
|
||||||
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
"PO-Revision-Date: 2011-01-20 14:40+0300\n"
|
"PO-Revision-Date: 2011-01-20 14:40+0300\n"
|
||||||
"Last-Translator: firnis <firnis@ya.ru>\n"
|
"Last-Translator: firnis <firnis@ya.ru>\n"
|
||||||
"Language-Team: Russian <>\n"
|
"Language-Team: Russian <>\n"
|
||||||
|
|
@ -543,6 +547,7 @@ msgstr "Добавление патча"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Добавить панель"
|
msgstr "Добавить панель"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
|
|
@ -552,6 +557,11 @@ msgstr "Добавить панель"
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Add..."
|
||||||
msgstr "Добавить..."
|
msgstr "Добавить..."
|
||||||
|
|
||||||
|
|
@ -606,6 +616,7 @@ msgstr "Все образа от GC/Wii (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "Все GCM-файлы Gamecube (gcm)"
|
msgstr "Все GCM-файлы Gamecube (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
|
@ -613,6 +624,10 @@ msgstr "Все GCM-файлы Gamecube (gcm)"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "Файлы быстрых сохранений (sav, s##)"
|
msgstr "Файлы быстрых сохранений (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -693,11 +708,15 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr "Вы уверены, что хотите удалить этот файл? Он исчезнет навсегда!"
|
msgstr "Вы уверены, что хотите удалить этот файл? Он исчезнет навсегда!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "Соотношение сторон:"
|
msgstr "Соотношение сторон:"
|
||||||
|
|
@ -719,11 +738,15 @@ msgstr "Система вывода"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: Ошибка открытия устройства вывода звука.\n"
|
msgstr "AudioCommon: Ошибка открытия устройства вывода звука.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Авто"
|
msgstr "Авто"
|
||||||
|
|
@ -839,10 +862,14 @@ msgstr "Синяя справа"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "снизу"
|
msgstr "снизу"
|
||||||
|
|
||||||
|
|
@ -875,11 +902,15 @@ msgstr "Укажите папку для сохранения"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "Буфер:"
|
msgstr "Буфер:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1114,10 +1145,14 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Закрыть"
|
msgstr "Закрыть"
|
||||||
|
|
@ -1227,11 +1262,15 @@ msgstr "Подключить Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "Подключить Wiimote 4"
|
msgstr "Подключить Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Подключение..."
|
msgstr "Подключение..."
|
||||||
|
|
||||||
|
|
@ -1418,10 +1457,14 @@ msgstr "Режим эмуляции CPU"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1637,11 +1680,15 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "/"
|
msgstr "/"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "Вы хотите остановить эмуляцию?"
|
msgstr "Вы хотите остановить эмуляцию?"
|
||||||
|
|
||||||
|
|
@ -1671,6 +1718,7 @@ msgstr "Настройки эмулируемого Wiimote"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin"
|
msgstr "Dolphin"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
|
@ -1686,6 +1734,14 @@ msgstr "Настройки Dolphin GCPad"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: 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
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1773,6 +1829,7 @@ msgid ""
|
||||||
"If unsure, leave this unchecked."
|
"If unsure, leave this unchecked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
|
|
@ -1782,6 +1839,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr "Dutch"
|
msgstr "Dutch"
|
||||||
|
|
@ -1910,22 +1972,32 @@ msgid "Enable Block Merging"
|
||||||
msgstr "Включить совмещение блоков"
|
msgstr "Включить совмещение блоков"
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "кэшировать"
|
msgstr "кэшировать"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "Включить чит-коды"
|
msgstr "Включить чит-коды"
|
||||||
|
|
||||||
|
|
@ -2066,6 +2138,7 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "End"
|
msgstr "End"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
|
@ -2075,6 +2148,11 @@ msgstr "End"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "English"
|
msgid "English"
|
||||||
msgstr "English"
|
msgstr "English"
|
||||||
|
|
@ -2105,6 +2183,7 @@ msgstr "Равно"
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Ошибки"
|
msgstr "Ошибки"
|
||||||
|
|
@ -2122,6 +2201,19 @@ msgid "Error"
|
||||||
msgstr "Ошибки"
|
msgstr "Ошибки"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Ошибки"
|
||||||
|
|
||||||
|
#: 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
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr "Ошибка загрузки выбранного языка. Возвращаемся к стандартному."
|
msgstr "Ошибка загрузки выбранного языка. Возвращаемся к стандартному."
|
||||||
|
|
@ -2556,6 +2648,7 @@ msgstr ""
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "Свободный обзор"
|
msgstr "Свободный обзор"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
|
@ -2565,6 +2658,11 @@ msgstr "Свободный обзор"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr "French"
|
msgstr "French"
|
||||||
|
|
@ -2635,10 +2733,14 @@ msgstr "Опции &контроллера Gamecube"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Файлы карт памяти Gamecube (*.raw,*.gcp)"
|
msgstr "Файлы карт памяти Gamecube (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2660,11 +2762,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "Общие"
|
msgstr "Общие"
|
||||||
|
|
@ -2674,6 +2781,7 @@ msgstr "Общие"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Настройки интерфейса"
|
msgstr "Настройки интерфейса"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
|
@ -2683,6 +2791,11 @@ msgstr "Настройки интерфейса"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr "German"
|
msgstr "German"
|
||||||
|
|
@ -2811,11 +2924,16 @@ msgstr "Настройка \"горячих\" клавиш"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Hotkeys"
|
||||||
msgstr "Клавиши"
|
msgstr "Клавиши"
|
||||||
|
|
||||||
|
|
@ -3032,11 +3150,15 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает."
|
"Вызван InstallExceptionHandler, но ваша платформа его еще не поддерживает."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "Устанавливается WAD в меню Wii..."
|
msgstr "Устанавливается WAD в меню Wii..."
|
||||||
|
|
@ -3121,6 +3243,7 @@ msgstr "Неверный файл записи"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Неверное сохранение"
|
msgstr "Неверное сохранение"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
|
@ -3130,6 +3253,11 @@ msgstr "Неверное сохранение"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr "Italian"
|
msgstr "Italian"
|
||||||
|
|
@ -3295,20 +3423,28 @@ msgstr "Быстрая &загрузка"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Загрузить игру..."
|
msgstr "Загрузить игру..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Загрузить Wii System Menu (%d %c)"
|
msgstr "Загрузить Wii System Menu (%d %c)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Загрузить Wii System Menu (%d %c)"
|
msgstr "Загрузить Wii System Menu (%d %c)"
|
||||||
|
|
@ -3392,11 +3528,15 @@ msgstr "Ускорить MMU (спидхак)"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "Файлы Gameshark MadCatz (*.gcs)"
|
msgstr "Файлы Gameshark MadCatz (*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3429,10 +3569,14 @@ msgstr "Па&мять"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "Карта памяти"
|
msgstr "Карта памяти"
|
||||||
|
|
||||||
|
|
@ -3610,11 +3754,15 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Вверх"
|
msgstr "NP Вверх"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3703,11 +3851,15 @@ msgstr "Не равно"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "Неизвестно"
|
msgstr "Неизвестно"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "Не подключено"
|
msgstr "Не подключено"
|
||||||
|
|
||||||
|
|
@ -3769,9 +3921,13 @@ msgstr "Доступно только %d блоков"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Открыть"
|
msgstr "Открыть"
|
||||||
|
|
||||||
|
|
@ -3897,6 +4053,7 @@ msgstr "Патчи"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "Папки"
|
msgstr "Папки"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
|
@ -3904,6 +4061,10 @@ msgstr "Папки"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Пауза"
|
msgstr "Пауза"
|
||||||
|
|
@ -3925,12 +4086,17 @@ msgstr "Точка %d"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Play"
|
||||||
msgstr "Запуск"
|
msgstr "Запуск"
|
||||||
|
|
||||||
|
|
@ -3958,11 +4124,15 @@ msgstr "Опции"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4187,6 +4357,7 @@ msgstr "&Обновить список игр"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "Обновление списка игр"
|
msgstr "Обновление списка игр"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
|
|
@ -4198,6 +4369,12 @@ msgstr "Обновление списка игр"
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Remove"
|
||||||
msgstr "Удалить"
|
msgstr "Удалить"
|
||||||
|
|
||||||
|
|
@ -4217,9 +4394,13 @@ msgstr "Выводить изображение в главное окно"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Сброс настроек"
|
msgstr "Сброс настроек"
|
||||||
|
|
@ -4262,11 +4443,15 @@ msgstr "Быстрое &сохранение"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "безопасное"
|
msgstr "безопасное"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "Частота"
|
msgstr "Частота"
|
||||||
|
|
@ -4359,11 +4544,15 @@ msgstr ""
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Поиск..."
|
msgstr "Поиск..."
|
||||||
|
|
@ -4403,6 +4592,7 @@ msgstr "Секция %s не найдена в SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Выбрать"
|
msgstr "Выбрать"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
|
|
@ -4418,6 +4608,14 @@ msgstr "Выберите файл для записи игрового проц
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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 "Выберите файл для записи игрового процесса"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Выберите файл сохранения для импорта"
|
msgstr "Выберите файл сохранения для импорта"
|
||||||
|
|
@ -4444,6 +4642,7 @@ msgstr ""
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Выберите файл для запуска..."
|
msgstr "Выберите файл для запуска..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
|
|
@ -4456,15 +4655,22 @@ msgstr "Выберите файл сохранения для загрузки"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Выберите файл сохранений Wii"
|
msgstr "Выберите файл сохранений Wii"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
msgid "Select the state to load"
|
msgid "Select the state to load"
|
||||||
msgstr "Выберите файл сохранения для загрузки"
|
msgstr "Выберите файл сохранения для загрузки"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Select the state to save"
|
||||||
msgstr "Выберите или укажите файл для быстрого сохранения"
|
msgstr "Выберите или укажите файл для быстрого сохранения"
|
||||||
|
|
||||||
|
|
@ -4825,6 +5031,7 @@ msgstr "Ошибка создания аудио-буфера %s."
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Пробел"
|
msgstr "Пробел"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
|
@ -4834,6 +5041,11 @@ msgstr "Пробел"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr "Spanish"
|
msgstr "Spanish"
|
||||||
|
|
@ -4871,11 +5083,15 @@ msgstr ""
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4913,9 +5129,13 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "Стоп"
|
msgstr "Стоп"
|
||||||
|
|
@ -4988,9 +5208,13 @@ msgstr "Правая панель"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "Сделать скриншот"
|
msgstr "Сделать скриншот"
|
||||||
|
|
||||||
|
|
@ -5236,18 +5460,26 @@ msgstr "Включить все"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "Включение полноэкранного режима"
|
msgstr "Включение полноэкранного режима"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "сверху"
|
msgstr "сверху"
|
||||||
|
|
||||||
|
|
@ -5351,6 +5583,7 @@ msgstr "Получено неизвестное сообщение с id : %d"
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr "Получено неизвестное сообщение с id : %d от игрока:%d Игрок выкинут!"
|
msgstr "Получено неизвестное сообщение с id : %d от игрока:%d Игрок выкинут!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
|
@ -5363,6 +5596,8 @@ msgstr ""
|
||||||
"Продолжить?"
|
"Продолжить?"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5573,11 +5808,15 @@ msgstr "DVD-диск:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "Импорт сохранений Wii"
|
msgstr "Импорт сохранений Wii"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Файлы сохранений Wii (*.bin)|*.bin"
|
msgstr "Файлы сохранений Wii (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5604,11 +5843,15 @@ msgid ""
|
||||||
"Do you want to reconnect immediately?"
|
"Do you want to reconnect immediately?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote подключен"
|
msgstr "Wiimote подключен"
|
||||||
|
|
||||||
|
|
@ -5644,6 +5887,7 @@ msgstr "Windows Right"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "Перенос строк"
|
msgstr "Перенос строк"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
|
|
@ -5653,6 +5897,11 @@ msgstr "Перенос строк"
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Working..."
|
||||||
msgstr "Подождите..."
|
msgstr "Подождите..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,10 +8,14 @@ msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
=======
|
=======
|
||||||
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
"PO-Revision-Date: 2011-03-02 21:58+0100\n"
|
"PO-Revision-Date: 2011-03-02 21:58+0100\n"
|
||||||
"Last-Translator: nikolassj\n"
|
"Last-Translator: nikolassj\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
|
|
@ -512,6 +516,7 @@ msgstr "Dodaj Patch "
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "Dodaj nova okna"
|
msgstr "Dodaj nova okna"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
|
|
@ -521,6 +526,11 @@ msgstr "Dodaj nova okna"
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Add..."
|
||||||
msgstr "Dodaj..."
|
msgstr "Dodaj..."
|
||||||
|
|
||||||
|
|
@ -574,6 +584,7 @@ msgstr ""
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
|
@ -581,6 +592,10 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -660,11 +675,15 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr "Jesi li siguran da zelis da obrises ovaj fajl? Nestace zauvek!"
|
msgstr "Jesi li siguran da zelis da obrises ovaj fajl? Nestace zauvek!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -685,11 +704,15 @@ msgstr ""
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "Auto"
|
msgstr "Auto"
|
||||||
|
|
@ -801,10 +824,14 @@ msgstr "Blue right "
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "Donji deo/dno"
|
msgstr "Donji deo/dno"
|
||||||
|
|
||||||
|
|
@ -837,11 +864,15 @@ msgstr ""
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1069,10 +1100,14 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "Zatvori"
|
msgstr "Zatvori"
|
||||||
|
|
@ -1181,11 +1216,15 @@ msgstr ""
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "Povezivanje..."
|
msgstr "Povezivanje..."
|
||||||
|
|
||||||
|
|
@ -1361,10 +1400,14 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1576,11 +1619,15 @@ msgstr ""
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1610,6 +1657,7 @@ msgstr ""
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin"
|
msgstr "Dolphin"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
|
@ -1625,6 +1673,14 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1707,6 +1763,7 @@ msgid ""
|
||||||
"If unsure, leave this unchecked."
|
"If unsure, leave this unchecked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
|
|
@ -1716,6 +1773,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Dutch"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1839,21 +1901,31 @@ msgid "Enable Block Merging"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -1979,6 +2051,7 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "Kraj"
|
msgstr "Kraj"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
|
@ -1988,6 +2061,11 @@ msgstr "Kraj"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "English"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2017,6 +2095,7 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "Error"
|
msgstr "Error"
|
||||||
|
|
@ -2034,6 +2113,19 @@ msgid "Error"
|
||||||
msgstr "Error"
|
msgstr "Error"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "Error"
|
||||||
|
|
||||||
|
#: 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
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2450,6 +2542,7 @@ msgstr ""
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
|
@ -2459,6 +2552,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "French"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2527,10 +2625,14 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2552,11 +2654,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -2566,6 +2673,7 @@ msgstr ""
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "Opcije Uredjaja "
|
msgstr "Opcije Uredjaja "
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
|
@ -2575,6 +2683,11 @@ msgstr "Opcije Uredjaja "
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "German"
|
||||||
msgstr "Nemacki "
|
msgstr "Nemacki "
|
||||||
|
|
||||||
|
|
@ -2692,11 +2805,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Hotkeys"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2892,11 +3010,15 @@ msgid ""
|
||||||
"InstallExceptionHandler called, but this platform does not yet support it."
|
"InstallExceptionHandler called, but this platform does not yet support it."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -2974,6 +3096,7 @@ msgstr ""
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
|
@ -2983,6 +3106,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Italian"
|
||||||
msgstr "Italianski "
|
msgstr "Italianski "
|
||||||
|
|
||||||
|
|
@ -3134,20 +3262,28 @@ msgstr "Ucitaj State Slot 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "Ucitaj State"
|
msgstr "Ucitaj State"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "Ucitaj Wii Sistem Meni (%d %c)"
|
msgstr "Ucitaj Wii Sistem Meni (%d %c)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "Ucitaj Wii Sistem Meni (%d %c)"
|
msgstr "Ucitaj Wii Sistem Meni (%d %c)"
|
||||||
|
|
@ -3224,11 +3360,15 @@ msgstr ""
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
@ -3261,10 +3401,14 @@ msgstr "&Memorija"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3441,11 +3585,15 @@ msgstr ""
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3532,11 +3680,15 @@ msgstr ""
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3598,9 +3750,13 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "Otvori "
|
msgstr "Otvori "
|
||||||
|
|
||||||
|
|
@ -3726,6 +3882,7 @@ msgstr ""
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
|
@ -3733,6 +3890,10 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "Pauza "
|
msgstr "Pauza "
|
||||||
|
|
@ -3754,12 +3915,17 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Play"
|
||||||
msgstr "Pokreni "
|
msgstr "Pokreni "
|
||||||
|
|
||||||
|
|
@ -3786,11 +3952,15 @@ msgstr "Opcije "
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -3998,6 +4168,7 @@ msgstr ""
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
|
|
@ -4009,6 +4180,12 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Remove"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4025,9 +4202,13 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "Reset/Restart "
|
msgstr "Reset/Restart "
|
||||||
|
|
@ -4070,11 +4251,15 @@ msgstr ""
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "Siguran "
|
msgstr "Siguran "
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4158,11 +4343,15 @@ msgstr ""
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "Skeniranje..."
|
msgstr "Skeniranje..."
|
||||||
|
|
@ -4202,6 +4391,7 @@ msgstr ""
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "Izaberi "
|
msgstr "Izaberi "
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
|
|
@ -4217,6 +4407,14 @@ msgstr "Izaberi Snimani fajl"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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 "Izaberi Snimani fajl"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje "
|
msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje "
|
||||||
|
|
@ -4243,6 +4441,7 @@ msgstr ""
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "Izaberi fajl za ucitavanje "
|
msgstr "Izaberi fajl za ucitavanje "
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
|
|
@ -4255,15 +4454,22 @@ msgstr "Izaberi state za ucitavanje "
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "Izaberi \"snimani fajl/the save state\""
|
msgstr "Izaberi \"snimani fajl/the save state\""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
msgid "Select the state to load"
|
msgid "Select the state to load"
|
||||||
msgstr "Izaberi state za ucitavanje "
|
msgstr "Izaberi state za ucitavanje "
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Select the state to save"
|
||||||
msgstr "Izaberi state za snimanje/save"
|
msgstr "Izaberi state za snimanje/save"
|
||||||
|
|
||||||
|
|
@ -4599,6 +4805,7 @@ msgstr ""
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
|
@ -4608,6 +4815,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Spanish"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4643,11 +4855,15 @@ msgstr ""
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4683,9 +4899,13 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr " Zaustavi"
|
msgstr " Zaustavi"
|
||||||
|
|
@ -4758,9 +4978,13 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -4975,18 +5199,26 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5088,6 +5320,7 @@ msgstr ""
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
|
@ -5098,6 +5331,8 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5305,11 +5540,15 @@ msgstr ""
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5336,11 +5575,15 @@ msgid ""
|
||||||
"Do you want to reconnect immediately?"
|
"Do you want to reconnect immediately?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
@ -5373,6 +5616,7 @@ msgstr ""
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
|
|
@ -5382,6 +5626,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Working..."
|
||||||
msgstr "Radi..."
|
msgstr "Radi..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,10 +8,14 @@ msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
=======
|
=======
|
||||||
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
"PO-Revision-Date: 2011-01-09 13:55-0800\n"
|
"PO-Revision-Date: 2011-01-09 13:55-0800\n"
|
||||||
"Last-Translator: thegfw <thegfw@gmail.com>\n"
|
"Last-Translator: thegfw <thegfw@gmail.com>\n"
|
||||||
"Language-Team: \n"
|
"Language-Team: \n"
|
||||||
|
|
@ -540,6 +544,7 @@ msgstr "添加补丁"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "添加新面板"
|
msgstr "添加新面板"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
|
|
@ -549,6 +554,11 @@ msgstr "添加新面板"
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Add..."
|
||||||
msgstr "添加..."
|
msgstr "添加..."
|
||||||
|
|
||||||
|
|
@ -602,6 +612,7 @@ msgstr "所有 GC/Wii 镜像 (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "所有 Gamecube GCM 文件 (gcm)"
|
msgstr "所有 Gamecube GCM 文件 (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
|
@ -609,6 +620,10 @@ msgstr "所有 Gamecube GCM 文件 (gcm)"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "所有存档状态 (sav, s##)"
|
msgstr "所有存档状态 (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -689,11 +704,15 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr "请确认真的要删除这些文件?这将是永久性的删除!"
|
msgstr "请确认真的要删除这些文件?这将是永久性的删除!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "高宽比:"
|
msgstr "高宽比:"
|
||||||
|
|
@ -714,11 +733,15 @@ msgstr "音频后端:"
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon: 打开 AO 设备错误.\n"
|
msgstr "AudioCommon: 打开 AO 设备错误.\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "自动"
|
msgstr "自动"
|
||||||
|
|
@ -831,10 +854,14 @@ msgstr "蓝 右"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "底部"
|
msgstr "底部"
|
||||||
|
|
||||||
|
|
@ -867,11 +894,15 @@ msgstr "浏览输出目录"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "缓冲区:"
|
msgstr "缓冲区:"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1107,10 +1138,14 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "关闭"
|
msgstr "关闭"
|
||||||
|
|
@ -1220,11 +1255,15 @@ msgstr "连接 Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "连接 Wiimote 4"
|
msgstr "连接 Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "连接中..."
|
msgstr "连接中..."
|
||||||
|
|
||||||
|
|
@ -1411,10 +1450,14 @@ msgstr "音频模拟引擎"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "音频 HLE 模拟(很快)"
|
msgstr "音频 HLE 模拟(很快)"
|
||||||
|
|
||||||
|
|
@ -1634,11 +1677,15 @@ msgstr "按模拟器显示输入读取"
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Divide"
|
msgstr "Divide"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "您确定是否停止当前模拟?"
|
msgstr "您确定是否停止当前模拟?"
|
||||||
|
|
||||||
|
|
@ -1668,6 +1715,7 @@ msgstr "Dolphin 模拟 Wiimote 设置"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin"
|
msgstr "Dolphin"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
|
@ -1683,6 +1731,14 @@ msgstr "Dolphin GC 手柄设置"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Dolphin GC 手柄设置"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Dolphin TAS 电影 (*.dtm)"
|
msgstr "Dolphin TAS 电影 (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1766,6 +1822,7 @@ msgid ""
|
||||||
"If unsure, leave this unchecked."
|
"If unsure, leave this unchecked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
|
|
@ -1775,6 +1832,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Dutch"
|
||||||
msgstr "荷兰语"
|
msgstr "荷兰语"
|
||||||
|
|
||||||
|
|
@ -1903,22 +1965,32 @@ msgid "Enable Block Merging"
|
||||||
msgstr "启用区块合并"
|
msgstr "启用区块合并"
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "启用缓存"
|
msgstr "启用缓存"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "启用作弊"
|
msgstr "启用作弊"
|
||||||
|
|
||||||
|
|
@ -2053,6 +2125,7 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "End"
|
msgstr "End"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
|
@ -2062,6 +2135,11 @@ msgstr "End"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "English"
|
||||||
msgstr "英语"
|
msgstr "英语"
|
||||||
|
|
||||||
|
|
@ -2091,6 +2169,7 @@ msgstr "等于"
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "错误"
|
msgstr "错误"
|
||||||
|
|
@ -2108,6 +2187,19 @@ msgid "Error"
|
||||||
msgstr "错误"
|
msgstr "错误"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "错误"
|
||||||
|
|
||||||
|
#: 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
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr "Error loading selected language. Falling back to system default."
|
msgstr "Error loading selected language. Falling back to system default."
|
||||||
|
|
@ -2562,6 +2654,7 @@ msgstr ""
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "自由视点"
|
msgstr "自由视点"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
|
@ -2571,6 +2664,11 @@ msgstr "自由视点"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "French"
|
||||||
msgstr "法语"
|
msgstr "法语"
|
||||||
|
|
||||||
|
|
@ -2639,10 +2737,14 @@ msgstr "Gamecube 手柄设置(&P)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Gamecube 内存卡 (*.raw,*.gcp)"
|
msgstr "Gamecube 内存卡 (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2666,11 +2768,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "常规"
|
msgstr "常规"
|
||||||
|
|
@ -2680,6 +2787,7 @@ msgstr "常规"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "界面设置"
|
msgstr "界面设置"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
|
@ -2689,6 +2797,11 @@ msgstr "界面设置"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "German"
|
||||||
msgstr "德语"
|
msgstr "德语"
|
||||||
|
|
||||||
|
|
@ -2811,11 +2924,16 @@ msgstr "热键设置"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Hotkeys"
|
||||||
msgstr "热键"
|
msgstr "热键"
|
||||||
|
|
||||||
|
|
@ -3025,11 +3143,15 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"InstallExceptionHandler called, but this platform does not yet support it."
|
"InstallExceptionHandler called, but this platform does not yet support it."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "安装 WAD 到 Wii 菜单中..."
|
msgstr "安装 WAD 到 Wii 菜单中..."
|
||||||
|
|
@ -3114,6 +3236,7 @@ msgstr "无效录制文件"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "Invalid state"
|
msgstr "Invalid state"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
|
@ -3123,6 +3246,11 @@ msgstr "Invalid state"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Italian"
|
||||||
msgstr "意大利语"
|
msgstr "意大利语"
|
||||||
|
|
||||||
|
|
@ -3281,20 +3409,28 @@ msgstr "载入存档插槽 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "载入状态..."
|
msgstr "载入状态..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "载入 Wii 系统菜单(%d %c)"
|
msgstr "载入 Wii 系统菜单(%d %c)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "载入 Wii 系统菜单(%d %c)"
|
msgstr "载入 Wii 系统菜单(%d %c)"
|
||||||
|
|
@ -3375,11 +3511,15 @@ msgstr "MMU 速度破解"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "MadCatz Gameshark 文件(*.gcs)"
|
msgstr "MadCatz Gameshark 文件(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "主摇杆"
|
msgstr "主摇杆"
|
||||||
|
|
@ -3412,10 +3552,14 @@ msgstr "内存(&M)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "内存卡"
|
msgstr "内存卡"
|
||||||
|
|
||||||
|
|
@ -3599,11 +3743,15 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Up"
|
msgstr "NP Up"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3691,11 +3839,15 @@ msgstr "不等于"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "未设置"
|
msgstr "未设置"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "未连接"
|
msgstr "未连接"
|
||||||
|
|
||||||
|
|
@ -3757,9 +3909,13 @@ msgstr "只有 %d 区块有效"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "打开"
|
msgstr "打开"
|
||||||
|
|
||||||
|
|
@ -3890,6 +4046,7 @@ msgstr "补丁"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "路径"
|
msgstr "路径"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
|
@ -3897,6 +4054,10 @@ msgstr "路径"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "暂停"
|
msgstr "暂停"
|
||||||
|
|
@ -3918,12 +4079,17 @@ msgstr "Perspective %d"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Play"
|
||||||
msgstr "开始"
|
msgstr "开始"
|
||||||
|
|
||||||
|
|
@ -3950,11 +4116,15 @@ msgstr "选项"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "玩家"
|
msgstr "玩家"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "请确认..."
|
msgstr "请确认..."
|
||||||
|
|
||||||
|
|
@ -4169,6 +4339,7 @@ msgstr "刷新列表"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "刷新游戏列表"
|
msgstr "刷新游戏列表"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
|
|
@ -4180,6 +4351,12 @@ msgstr "刷新游戏列表"
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Remove"
|
||||||
msgstr "移除"
|
msgstr "移除"
|
||||||
|
|
||||||
|
|
@ -4199,9 +4376,13 @@ msgstr "附加到主窗口"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "重置"
|
msgstr "重置"
|
||||||
|
|
@ -4244,11 +4425,15 @@ msgstr "保存状态(&V)"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "安全"
|
msgstr "安全"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "采样率:"
|
msgstr "采样率:"
|
||||||
|
|
||||||
|
|
@ -4333,11 +4518,15 @@ msgstr "Savestate movie %s is corrupted, movie recording stopping..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "EFB 比例复制"
|
msgstr "EFB 比例复制"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "扫描中..."
|
msgstr "扫描中..."
|
||||||
|
|
@ -4377,6 +4566,7 @@ msgstr "Section %s not found in SYSCONF"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "选择"
|
msgstr "选择"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
|
|
@ -4392,6 +4582,14 @@ msgstr "选择录制文件"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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 "选择录制文件"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "选择要导入的存档"
|
msgstr "选择要导入的存档"
|
||||||
|
|
@ -4418,6 +4616,7 @@ msgstr "选择浮动窗口"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "选择要载入的文件"
|
msgstr "选择要载入的文件"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
|
|
@ -4430,15 +4629,22 @@ msgstr "选择要载入的状态"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "选择一个存档文件"
|
msgstr "选择一个存档文件"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
msgid "Select the state to load"
|
msgid "Select the state to load"
|
||||||
msgstr "选择要载入的状态"
|
msgstr "选择要载入的状态"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Select the state to save"
|
||||||
msgstr "选择要保存的状态"
|
msgstr "选择要保存的状态"
|
||||||
|
|
||||||
|
|
@ -4787,6 +4993,7 @@ msgstr "声音缓冲区创建失败: %s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "空格"
|
msgstr "空格"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
|
@ -4796,6 +5003,11 @@ msgstr "空格"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Spanish"
|
||||||
msgstr "西班牙语"
|
msgstr "西班牙语"
|
||||||
|
|
||||||
|
|
@ -4831,11 +5043,15 @@ msgstr "方块键"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "标准控制器"
|
msgstr "标准控制器"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4871,9 +5087,13 @@ msgstr "摇杆"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "停止"
|
msgstr "停止"
|
||||||
|
|
@ -4947,9 +5167,13 @@ msgstr "Table Right"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "屏幕截图(&T)"
|
msgstr "屏幕截图(&T)"
|
||||||
|
|
||||||
|
|
@ -5186,18 +5410,26 @@ msgstr "切换所有日志类型"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "切换全屏"
|
msgstr "切换全屏"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "顶部"
|
msgstr "顶部"
|
||||||
|
|
||||||
|
|
@ -5301,6 +5533,7 @@ msgstr "Unknown message received with id : %d"
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr "Unknown message with id:%d received from player:%d Kicking player!"
|
msgstr "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
|
@ -5313,6 +5546,8 @@ msgstr ""
|
||||||
"继续?"
|
"继续?"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5523,11 +5758,15 @@ msgstr "DVD 根目录:"
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "导入 Wii 存档"
|
msgstr "导入 Wii 存档"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Wii 存档文件 (*.bin)|*.bin"
|
msgstr "Wii 存档文件 (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5558,11 +5797,15 @@ msgstr ""
|
||||||
"or maybe it is due to idle time out or other reason.\n"
|
"or maybe it is due to idle time out or other reason.\n"
|
||||||
"Do you want to reconnect immediately?"
|
"Do you want to reconnect immediately?"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote 已连接"
|
msgstr "Wiimote 已连接"
|
||||||
|
|
||||||
|
|
@ -5595,6 +5838,7 @@ msgstr "窗口右侧"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "自动换行"
|
msgstr "自动换行"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
|
|
@ -5604,6 +5848,11 @@ msgstr "自动换行"
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Working..."
|
||||||
msgstr "工作中..."
|
msgstr "工作中..."
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,10 +8,14 @@ msgstr ""
|
||||||
"Project-Id-Version: Dolphin Emu\n"
|
"Project-Id-Version: Dolphin Emu\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
=======
|
=======
|
||||||
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
"PO-Revision-Date: 2011-03-15 02:51+0800\n"
|
"PO-Revision-Date: 2011-03-15 02:51+0800\n"
|
||||||
"Last-Translator: khiav <khiav1118@yahoo.com.tw>\n"
|
"Last-Translator: khiav <khiav1118@yahoo.com.tw>\n"
|
||||||
"Language-Team: khiav&yrbn <http://khiav.99k.org/>\n"
|
"Language-Team: khiav&yrbn <http://khiav.99k.org/>\n"
|
||||||
|
|
@ -540,6 +544,7 @@ msgstr "新增修正"
|
||||||
msgid "Add new pane"
|
msgid "Add new pane"
|
||||||
msgstr "新增面版"
|
msgstr "新增面版"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
|
||||||
|
|
@ -549,6 +554,11 @@ msgstr "新增面版"
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Add..."
|
||||||
msgstr "新增..."
|
msgstr "新增..."
|
||||||
|
|
||||||
|
|
@ -615,6 +625,7 @@ msgstr "所有 GC/Wii 映像檔 (gcm, iso, ciso, gcz)"
|
||||||
msgid "All Gamecube GCM files (gcm)"
|
msgid "All Gamecube GCM files (gcm)"
|
||||||
msgstr "所有 Gamecube GCM 檔案 (gcm)"
|
msgstr "所有 Gamecube GCM 檔案 (gcm)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
|
||||||
|
|
@ -622,6 +633,10 @@ msgstr "所有 Gamecube GCM 檔案 (gcm)"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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##)"
|
msgid "All Save States (sav, s##)"
|
||||||
msgstr "所有即時存檔 (sav, s##)"
|
msgstr "所有即時存檔 (sav, s##)"
|
||||||
|
|
||||||
|
|
@ -702,11 +717,15 @@ msgstr ""
|
||||||
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
msgid "Are you sure you want to delete this file? It will be gone forever!"
|
||||||
msgstr "是否真的要刪除這些檔案？刪了之後就回不來了哦！"
|
msgstr "是否真的要刪除這些檔案？刪了之後就回不來了哦！"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
|
||||||
msgid "Aspect Ratio:"
|
msgid "Aspect Ratio:"
|
||||||
msgstr "畫面比例："
|
msgstr "畫面比例："
|
||||||
|
|
@ -727,11 +746,15 @@ msgstr "聲音裝置："
|
||||||
msgid "AudioCommon: Error opening AO device.\n"
|
msgid "AudioCommon: Error opening AO device.\n"
|
||||||
msgstr "AudioCommon：開啟 AO 裝置出錯。\n"
|
msgstr "AudioCommon：開啟 AO 裝置出錯。\n"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
|
||||||
msgid "Auto"
|
msgid "Auto"
|
||||||
msgstr "自動"
|
msgstr "自動"
|
||||||
|
|
@ -844,10 +867,14 @@ msgstr "藍 右"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Bottom"
|
msgid "Bottom"
|
||||||
msgstr "下方"
|
msgstr "下方"
|
||||||
|
|
||||||
|
|
@ -880,11 +907,15 @@ msgstr "瀏覽輸出的資料夾"
|
||||||
msgid "Buffer:"
|
msgid "Buffer:"
|
||||||
msgstr "緩衝："
|
msgstr "緩衝："
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/UDPConfigDiag.cpp:23
|
||||||
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
|
||||||
msgid "Buttons"
|
msgid "Buttons"
|
||||||
|
|
@ -1116,10 +1147,14 @@ msgstr "在遊戲執行時客戶端斷開連接！！網路對戰已經被關閉
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
|
||||||
msgid "Close"
|
msgid "Close"
|
||||||
msgstr "關閉"
|
msgstr "關閉"
|
||||||
|
|
@ -1229,11 +1264,15 @@ msgstr "連接 Wiimote 3"
|
||||||
msgid "Connect Wiimote 4"
|
msgid "Connect Wiimote 4"
|
||||||
msgstr "連接 Wiimote 4"
|
msgstr "連接 Wiimote 4"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Connecting..."
|
msgid "Connecting..."
|
||||||
msgstr "正在連接..."
|
msgstr "正在連接..."
|
||||||
|
|
||||||
|
|
@ -1419,10 +1458,14 @@ msgstr "DSP 模擬引擎"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "DSP HLE emulation (fast)"
|
||||||
msgstr "DSP HLE 模擬器 (快)"
|
msgstr "DSP HLE 模擬器 (快)"
|
||||||
|
|
||||||
|
|
@ -1642,11 +1685,15 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。"
|
||||||
msgid "Divide"
|
msgid "Divide"
|
||||||
msgstr "Divide"
|
msgstr "Divide"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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?"
|
msgid "Do you want to stop the current emulation?"
|
||||||
msgstr "您要停止目前的模擬嗎？"
|
msgstr "您要停止目前的模擬嗎？"
|
||||||
|
|
||||||
|
|
@ -1676,6 +1723,7 @@ msgstr "Dolphin 模擬 Wiimote 設定"
|
||||||
msgid "Dolphin FIFO"
|
msgid "Dolphin FIFO"
|
||||||
msgstr "Dolphin"
|
msgstr "Dolphin"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
msgid "Dolphin GCPad Configuration"
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
|
@ -1691,6 +1739,14 @@ msgstr "Dolphin GC 控制器設定"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
|
||||||
|
msgid "Dolphin GCPad Configuration"
|
||||||
|
msgstr "Dolphin GC 控制器設定"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Dolphin TAS Movies (*.dtm)"
|
msgid "Dolphin TAS Movies (*.dtm)"
|
||||||
msgstr "Dolphin TAS 影片 (*.dtm)"
|
msgstr "Dolphin TAS 影片 (*.dtm)"
|
||||||
|
|
||||||
|
|
@ -1774,6 +1830,7 @@ msgid ""
|
||||||
"If unsure, leave this unchecked."
|
"If unsure, leave this unchecked."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
|
||||||
|
|
@ -1783,6 +1840,11 @@ msgstr ""
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Dutch"
|
||||||
msgstr "Dutch"
|
msgstr "Dutch"
|
||||||
|
|
||||||
|
|
@ -1909,22 +1971,32 @@ msgid "Enable Block Merging"
|
||||||
msgstr "開啟塊合併"
|
msgstr "開啟塊合併"
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
|
||||||
msgid "Enable Bounding Box Calculation"
|
msgid "Enable Bounding Box Calculation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Enable Cache"
|
msgid "Enable Cache"
|
||||||
msgstr "開啟快取"
|
msgstr "開啟快取"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Enable Cheats"
|
msgid "Enable Cheats"
|
||||||
msgstr "開啟作弊"
|
msgstr "開啟作弊"
|
||||||
|
|
||||||
|
|
@ -2056,6 +2128,7 @@ msgstr ""
|
||||||
msgid "End"
|
msgid "End"
|
||||||
msgstr "End"
|
msgstr "End"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
|
|
@ -2065,6 +2138,11 @@ msgstr "End"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "English"
|
||||||
msgstr "English"
|
msgstr "English"
|
||||||
|
|
||||||
|
|
@ -2094,6 +2172,7 @@ msgstr "等於"
|
||||||
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
msgid "Error"
|
msgid "Error"
|
||||||
msgstr "錯誤"
|
msgstr "錯誤"
|
||||||
|
|
@ -2111,6 +2190,19 @@ msgid "Error"
|
||||||
msgstr "錯誤"
|
msgstr "錯誤"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
|
||||||
|
msgid "Error"
|
||||||
|
msgstr "錯誤"
|
||||||
|
|
||||||
|
#: 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
|
#: Source/Core/DolphinWX/Src/Main.cpp:346
|
||||||
msgid "Error loading selected language. Falling back to system default."
|
msgid "Error loading selected language. Falling back to system default."
|
||||||
msgstr "讀取選擇的語系出錯。返回使用系統預設值。"
|
msgstr "讀取選擇的語系出錯。返回使用系統預設值。"
|
||||||
|
|
@ -2563,6 +2655,7 @@ msgstr ""
|
||||||
msgid "Free Look"
|
msgid "Free Look"
|
||||||
msgstr "自由視點"
|
msgstr "自由視點"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
|
|
@ -2572,6 +2665,11 @@ msgstr "自由視點"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "French"
|
||||||
msgstr "French"
|
msgstr "French"
|
||||||
|
|
||||||
|
|
@ -2640,10 +2738,14 @@ msgstr "Gamecube 控制器設定(&P)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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)"
|
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
|
||||||
msgstr "Gamecube 記憶卡 (*.raw,*.gcp)"
|
msgstr "Gamecube 記憶卡 (*.raw,*.gcp)"
|
||||||
|
|
||||||
|
|
@ -2667,11 +2769,16 @@ msgstr ""
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
|
||||||
msgid "General"
|
msgid "General"
|
||||||
msgstr "一般"
|
msgstr "一般"
|
||||||
|
|
@ -2681,6 +2788,7 @@ msgstr "一般"
|
||||||
msgid "General Settings"
|
msgid "General Settings"
|
||||||
msgstr "界面設定"
|
msgstr "界面設定"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
|
||||||
|
|
@ -2690,6 +2798,11 @@ msgstr "界面設定"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "German"
|
||||||
msgstr "German"
|
msgstr "German"
|
||||||
|
|
||||||
|
|
@ -2812,11 +2925,16 @@ msgstr "快捷鍵設定"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Hotkeys"
|
||||||
msgstr "快捷鍵"
|
msgstr "快捷鍵"
|
||||||
|
|
||||||
|
|
@ -3018,11 +3136,15 @@ msgid ""
|
||||||
"InstallExceptionHandler called, but this platform does not yet support it."
|
"InstallExceptionHandler called, but this platform does not yet support it."
|
||||||
msgstr "調用 InstallExceptionHandler，但是這個平台尚未支援此功能。"
|
msgstr "調用 InstallExceptionHandler，但是這個平台尚未支援此功能。"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Installing WAD..."
|
msgid "Installing WAD..."
|
||||||
msgstr "正在安裝 WAD 至 Wii 選單..."
|
msgstr "正在安裝 WAD 至 Wii 選單..."
|
||||||
|
|
||||||
|
|
@ -3106,6 +3228,7 @@ msgstr "無效的錄像檔"
|
||||||
msgid "Invalid state"
|
msgid "Invalid state"
|
||||||
msgstr "無效的狀態"
|
msgstr "無效的狀態"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
|
||||||
|
|
@ -3115,6 +3238,11 @@ msgstr "無效的狀態"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Italian"
|
||||||
msgstr "Italian"
|
msgstr "Italian"
|
||||||
|
|
||||||
|
|
@ -3273,20 +3401,28 @@ msgstr "讀取儲存格 8"
|
||||||
msgid "Load State..."
|
msgid "Load State..."
|
||||||
msgstr "讀取進度檔..."
|
msgstr "讀取進度檔..."
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy
|
#, fuzzy
|
||||||
msgid "Load Wii System Menu"
|
msgid "Load Wii System Menu"
|
||||||
msgstr "讀取 Wii 系統選單 (%d%c)"
|
msgstr "讀取 Wii 系統選單 (%d%c)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Load Wii System Menu %d%c"
|
msgid "Load Wii System Menu %d%c"
|
||||||
msgstr "讀取 Wii 系統選單 (%d%c)"
|
msgstr "讀取 Wii 系統選單 (%d%c)"
|
||||||
|
|
@ -3367,11 +3503,15 @@ msgstr "MMU 速度修正"
|
||||||
msgid "MadCatz Gameshark files(*.gcs)"
|
msgid "MadCatz Gameshark files(*.gcs)"
|
||||||
msgstr "MadCatz Gameshark 檔案(*.gcs)"
|
msgstr "MadCatz Gameshark 檔案(*.gcs)"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
|
||||||
msgid "Main Stick"
|
msgid "Main Stick"
|
||||||
msgstr "主搖桿"
|
msgstr "主搖桿"
|
||||||
|
|
@ -3404,10 +3544,14 @@ msgstr "記憶卡(&M)"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Memory Card"
|
msgid "Memory Card"
|
||||||
msgstr "記憶卡"
|
msgstr "記憶卡"
|
||||||
|
|
||||||
|
|
@ -3591,11 +3735,15 @@ msgstr "NP Tab"
|
||||||
msgid "NP Up"
|
msgid "NP Up"
|
||||||
msgstr "NP Up"
|
msgstr "NP Up"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/PatchAddEdit.cpp:58
|
||||||
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
|
||||||
msgid "Name:"
|
msgid "Name:"
|
||||||
|
|
@ -3683,11 +3831,15 @@ msgstr "不相等"
|
||||||
msgid "Not Set"
|
msgid "Not Set"
|
||||||
msgstr "未設定"
|
msgstr "未設定"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
#: Source/Core/DolphinWX/Src/Main.cpp:597
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:596
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Not connected"
|
msgid "Not connected"
|
||||||
msgstr "未連接"
|
msgstr "未連接"
|
||||||
|
|
||||||
|
|
@ -3749,9 +3901,13 @@ msgstr "僅 %d 個區塊可用"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Open"
|
msgid "Open"
|
||||||
msgstr "開啟"
|
msgstr "開啟"
|
||||||
|
|
||||||
|
|
@ -3880,6 +4036,7 @@ msgstr "修正"
|
||||||
msgid "Paths"
|
msgid "Paths"
|
||||||
msgstr "路徑"
|
msgstr "路徑"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
|
||||||
|
|
@ -3887,6 +4044,10 @@ msgstr "路徑"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
|
||||||
msgid "Pause"
|
msgid "Pause"
|
||||||
msgstr "暫停"
|
msgstr "暫停"
|
||||||
|
|
@ -3908,12 +4069,17 @@ msgstr "版式 %d"
|
||||||
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Play"
|
||||||
msgstr "執行"
|
msgstr "執行"
|
||||||
|
|
||||||
|
|
@ -3940,11 +4106,15 @@ msgstr "選項"
|
||||||
msgid "Players"
|
msgid "Players"
|
||||||
msgstr "玩家"
|
msgstr "玩家"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Please confirm..."
|
msgid "Please confirm..."
|
||||||
msgstr "請確認..."
|
msgstr "請確認..."
|
||||||
|
|
||||||
|
|
@ -4158,6 +4328,7 @@ msgstr "更新列表"
|
||||||
msgid "Refresh game list"
|
msgid "Refresh game list"
|
||||||
msgstr "更新遊戲列表"
|
msgstr "更新遊戲列表"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
|
||||||
|
|
@ -4169,6 +4340,12 @@ msgstr "更新遊戲列表"
|
||||||
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Remove"
|
||||||
msgstr "移除"
|
msgstr "移除"
|
||||||
|
|
||||||
|
|
@ -4188,9 +4365,13 @@ msgstr "渲染至主視窗"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
|
||||||
msgid "Reset"
|
msgid "Reset"
|
||||||
msgstr "重置"
|
msgstr "重置"
|
||||||
|
|
@ -4233,11 +4414,15 @@ msgstr "儲存進度(&V)"
|
||||||
msgid "Safe"
|
msgid "Safe"
|
||||||
msgstr "安全"
|
msgstr "安全"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Sample Rate:"
|
msgid "Sample Rate:"
|
||||||
msgstr "取樣率："
|
msgstr "取樣率："
|
||||||
|
|
||||||
|
|
@ -4322,11 +4507,15 @@ msgstr "儲存的影片 %s 是損毀的，影片錄製停止..."
|
||||||
msgid "Scaled EFB Copy"
|
msgid "Scaled EFB Copy"
|
||||||
msgstr "EFB 縮放複製"
|
msgstr "EFB 縮放複製"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#, fuzzy, c-format
|
#, fuzzy, c-format
|
||||||
msgid "Scanning %s"
|
msgid "Scanning %s"
|
||||||
msgstr "正在掃瞄..."
|
msgstr "正在掃瞄..."
|
||||||
|
|
@ -4366,6 +4555,7 @@ msgstr "項目 %s 在 SYSCONF 中找不到"
|
||||||
msgid "Select"
|
msgid "Select"
|
||||||
msgstr "選擇"
|
msgstr "選擇"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
|
||||||
|
|
@ -4381,6 +4571,14 @@ msgstr "選擇已錄製的檔案"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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 "選擇已錄製的檔案"
|
||||||
|
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select a Wii WAD file to install"
|
msgid "Select a Wii WAD file to install"
|
||||||
msgstr "選擇要安裝的 Wii WAD"
|
msgstr "選擇要安裝的 Wii WAD"
|
||||||
|
|
||||||
|
|
@ -4406,6 +4604,7 @@ msgstr "選擇浮動視窗"
|
||||||
msgid "Select the file to load"
|
msgid "Select the file to load"
|
||||||
msgstr "選擇要讀取的檔案"
|
msgstr "選擇要讀取的檔案"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
|
|
@ -4418,15 +4617,22 @@ msgstr "選擇要讀取的進度"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Select the save file"
|
msgid "Select the save file"
|
||||||
msgstr "選擇存檔"
|
msgstr "選擇存檔"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
|
||||||
msgid "Select the state to load"
|
msgid "Select the state to load"
|
||||||
msgstr "選擇要讀取的進度"
|
msgstr "選擇要讀取的進度"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Select the state to save"
|
||||||
msgstr "選擇要儲存的進度"
|
msgstr "選擇要儲存的進度"
|
||||||
|
|
||||||
|
|
@ -4774,6 +4980,7 @@ msgstr "聲音緩衝建立失敗：%s"
|
||||||
msgid "Space"
|
msgid "Space"
|
||||||
msgstr "Space"
|
msgstr "Space"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
|
||||||
|
|
@ -4783,6 +4990,11 @@ msgstr "Space"
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Spanish"
|
||||||
msgstr "Spanish"
|
msgstr "Spanish"
|
||||||
|
|
||||||
|
|
@ -4818,11 +5030,15 @@ msgstr "Square Stick"
|
||||||
msgid "Standard Controller"
|
msgid "Standard Controller"
|
||||||
msgstr "標準控制器"
|
msgstr "標準控制器"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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/WXInputBase.cpp:38
|
||||||
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
|
||||||
msgid "Start"
|
msgid "Start"
|
||||||
|
|
@ -4858,9 +5074,13 @@ msgstr "搖桿"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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
|
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
|
||||||
msgid "Stop"
|
msgid "Stop"
|
||||||
msgstr "停止"
|
msgstr "停止"
|
||||||
|
|
@ -4934,9 +5154,13 @@ msgstr "Table 右"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Take Screenshot"
|
msgid "Take Screenshot"
|
||||||
msgstr "截取畫面"
|
msgstr "截取畫面"
|
||||||
|
|
||||||
|
|
@ -5163,18 +5387,26 @@ msgstr "全選/全部取消"
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
|
||||||
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
=======
|
=======
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Toggle Fullscreen"
|
msgid "Toggle Fullscreen"
|
||||||
msgstr "切換全螢幕"
|
msgstr "切換全螢幕"
|
||||||
|
|
||||||
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Top"
|
msgid "Top"
|
||||||
msgstr "上方"
|
msgstr "上方"
|
||||||
|
|
||||||
|
|
@ -5278,6 +5510,7 @@ msgstr "接收到帶有未知 id 的錯誤訊息：%d"
|
||||||
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
msgid "Unknown message with id:%d received from player:%d Kicking player!"
|
||||||
msgstr "知訊息帶有 id:%d 接收於玩家:%d 正在提出玩家！"
|
msgstr "知訊息帶有 id:%d 接收於玩家:%d 正在提出玩家！"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
#: Source/Core/Core/Src/HW/Memmap.cpp:633
|
||||||
|
|
@ -5290,6 +5523,8 @@ msgstr ""
|
||||||
"是否繼續？"
|
"是否繼續？"
|
||||||
|
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
|
||||||
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
|
||||||
msgid "Up"
|
msgid "Up"
|
||||||
|
|
@ -5500,11 +5735,15 @@ msgstr "DVD 根："
|
||||||
msgid "Wii Save Import"
|
msgid "Wii Save Import"
|
||||||
msgstr "匯入 Wii 存檔"
|
msgstr "匯入 Wii 存檔"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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"
|
msgid "Wii save files (*.bin)|*.bin"
|
||||||
msgstr "Wii 存檔 (*.bin)|*.bin"
|
msgstr "Wii 存檔 (*.bin)|*.bin"
|
||||||
|
|
||||||
|
|
@ -5535,11 +5774,15 @@ msgstr ""
|
||||||
"或閒置的時間太久。\n"
|
"或閒置的時間太久。\n"
|
||||||
"是否要重新連接？"
|
"是否要重新連接？"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
=======
|
=======
|
||||||
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
#: Source/Core/DolphinWX/Src/Main.cpp:599
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> Update translation files for recent changes in the code.
|
||||||
|
=======
|
||||||
|
#: Source/Core/DolphinWX/Src/Main.cpp:598
|
||||||
|
>>>>>>> Update from master branch.
|
||||||
msgid "Wiimote Connected"
|
msgid "Wiimote Connected"
|
||||||
msgstr "Wiimote 已連接"
|
msgstr "Wiimote 已連接"
|
||||||
|
|
||||||
|
|
@ -5572,6 +5815,7 @@ msgstr "視窗 右"
|
||||||
msgid "Word Wrap"
|
msgid "Word Wrap"
|
||||||
msgstr "自動換行"
|
msgstr "自動換行"
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
|
||||||
|
|
@ -5581,6 +5825,11 @@ msgstr "自動換行"
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
|
||||||
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
|
||||||
>>>>>>> Update translation files for recent changes in the code.
|
>>>>>>> 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..."
|
msgid "Working..."
|
||||||
msgstr "執行中..."
|
msgstr "執行中..."
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue