Update translation files for recent changes in the code.

This commit is contained in:
Glenn Rice
2012-03-09 17:46:09 -06:00
parent b69a1d225a
commit 61d5624c2d
24 changed files with 6302 additions and 0 deletions
+245
View File
@@ -7,7 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: Dolphin Emu\n"
"Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
=======
"POT-Creation-Date: 2011-10-11 23:25-0500\n"
>>>>>>> Update translation files for recent changes in the code.
"PO-Revision-Date: 2011-08-07 16:43+0100\n"
"Last-Translator: Goost <[email protected]>\n"
"Language-Team: DevPro Team. <[email protected]>\n"
@@ -556,9 +560,15 @@ msgstr "Voeg Patch toe"
msgid "Add new pane"
msgstr "Voeg een nieuwe paneel toe"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:411
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:433
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:747
>>>>>>> Update translation files for recent changes in the code.
msgid "Add..."
msgstr "Voeg toe..."
@@ -626,8 +636,13 @@ msgstr "Alle GC/Wii images (gcm, iso, ciso, gcz)"
msgid "All Gamecube GCM files (gcm)"
msgstr "Alle Gamecube GCM bestanden (gcm)"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1459
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1473
>>>>>>> Update translation files for recent changes in the code.
msgid "All Save States (sav, s##)"
msgstr "Alle Opgeslagen Staten (sav, s##)"
@@ -718,7 +733,11 @@ msgstr ""
"Weet je zeker dat je dit bestand wilt verwijderen? Deze gegevens zijn niet "
"terug te halen!"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
>>>>>>> Update translation files for recent changes in the code.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
msgid "Aspect Ratio:"
msgstr "Beeldverhouding:"
@@ -739,7 +758,11 @@ msgstr "Geluid Backend:"
msgid "AudioCommon: Error opening AO device.\n"
msgstr "AudioCommon: Fout bij het openen van een AO toestel. \n"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
>>>>>>> Update translation files for recent changes in the code.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
msgid "Auto"
msgstr "Auto"
@@ -850,7 +873,11 @@ msgid "Blue Right"
msgstr "Blauw Rechts"
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
>>>>>>> Update translation files for recent changes in the code.
msgid "Bottom"
msgstr "Onder"
@@ -883,7 +910,11 @@ msgstr "Zoek een uitvoer folder"
msgid "Buffer:"
msgstr "Buffer:"
<<<<<<< HEAD
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
=======
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
>>>>>>> Update translation files for recent changes in the code.
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
msgid "Buttons"
@@ -1128,7 +1159,11 @@ msgstr ""
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
>>>>>>> Update translation files for recent changes in the code.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
msgid "Close"
msgstr "Sluit"
@@ -1238,7 +1273,11 @@ msgstr "Verbind Wiimote 3"
msgid "Connect Wiimote 4"
msgstr "Verbind Wiimote 4"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/Main.cpp:597
=======
#: Source/Core/DolphinWX/Src/Main.cpp:598
>>>>>>> Update translation files for recent changes in the code.
msgid "Connecting..."
msgstr "Verbinden..."
@@ -1429,7 +1468,11 @@ msgid "DSP Emulator Engine"
msgstr "DSP Emulator Motor"
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
>>>>>>> Update translation files for recent changes in the code.
msgid "DSP HLE emulation (fast)"
msgstr "DSP HLE emulatie (snel)"
@@ -1662,7 +1705,11 @@ msgstr ""
msgid "Divide"
msgstr "Verdelen"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
>>>>>>> Update translation files for recent changes in the code.
msgid "Do you want to stop the current emulation?"
msgstr "Wil je de emulatie stoppen?"
@@ -1691,12 +1738,21 @@ msgstr "Dolphin Geëmuleerde Wiimote configuratie"
msgid "Dolphin FIFO"
msgstr "Dolphin FIFO"
<<<<<<< HEAD
#: 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
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
msgid "Dolphin GCPad Configuration"
msgstr "Dolphin GCPad Configuratie"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:742
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
>>>>>>> Update translation files for recent changes in the code.
msgid "Dolphin TAS Movies (*.dtm)"
msgstr "Dolphin TAS Film (*.dtm)"
@@ -1791,9 +1847,15 @@ msgstr ""
"\n"
"In geval van twijfel leeg laten."
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:294
>>>>>>> Update translation files for recent changes in the code.
msgid "Dutch"
msgstr "Nederlands"
@@ -1936,16 +1998,23 @@ msgstr "Activeer BAT"
msgid "Enable Block Merging"
msgstr "Activeer Block Merging"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
msgid "Enable Bounding Box Calculation"
msgstr ""
=======
>>>>>>> Update translation files for recent changes in the code.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
#, fuzzy
msgid "Enable Cache"
msgstr "Activeer Cache"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
>>>>>>> Update translation files for recent changes in the code.
msgid "Enable Cheats"
msgstr "Activeer Cheats"
@@ -2101,9 +2170,15 @@ msgstr ""
msgid "End"
msgstr "Einde"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:476
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:262
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
>>>>>>> Update translation files for recent changes in the code.
msgid "English"
msgstr "Engels"
@@ -2132,6 +2207,7 @@ msgstr "Gelijk"
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
msgid "Error"
msgstr "Error (Fout)"
@@ -2143,6 +2219,12 @@ msgid ""
"Sorry, Wii recording is temporarily broken."
msgstr ""
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
msgid "Error"
msgstr "Error (Fout)"
>>>>>>> Update translation files for recent changes in the code.
#: Source/Core/DolphinWX/Src/Main.cpp:346
msgid "Error loading selected language. Falling back to system default."
msgstr ""
@@ -2605,9 +2687,15 @@ msgstr "Frames om op te nemen"
msgid "Free Look"
msgstr "Vrije kijk"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:478
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
>>>>>>> Update translation files for recent changes in the code.
msgid "French"
msgstr "Frans"
@@ -2675,7 +2763,11 @@ msgid "Gamecube &Pad Settings"
msgstr "Gamecube &Pad Instellingen"
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
>>>>>>> Update translation files for recent changes in the code.
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
msgstr "Gamecube Memory Kaarten (*.raw,*.gcp)"
@@ -2698,8 +2790,12 @@ msgstr ""
"(ofwel een onjuiste code of het type code is nog niet ondersteund.)"
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
>>>>>>> Update translation files for recent changes in the code.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
msgid "General"
msgstr "Algemeen"
@@ -2708,9 +2804,15 @@ msgstr "Algemeen"
msgid "General Settings"
msgstr "Algemene Instellingen"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:477
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
>>>>>>> Update translation files for recent changes in the code.
msgid "German"
msgstr "Duits"
@@ -2841,8 +2943,12 @@ msgid "Hotkey Configuration"
msgstr "Sneltoets Configuratie"
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
>>>>>>> Update translation files for recent changes in the code.
msgid "Hotkeys"
msgstr "Hotkeys"
@@ -3067,7 +3173,11 @@ msgstr ""
"InstallExceptionHandler opgeroepen, maar dit platform ondersteund dit nog "
"niet."
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
>>>>>>> Update translation files for recent changes in the code.
msgid "Installing WAD..."
msgstr "WAD aan het installeren..."
@@ -3150,9 +3260,15 @@ msgstr "Onjuist opname bestand"
msgid "Invalid state"
msgstr "Onjuiste staat"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:301
>>>>>>> Update translation files for recent changes in the code.
msgid "Italian"
msgstr "Italië"
@@ -3310,12 +3426,20 @@ msgstr "Laad staat 8"
msgid "Load State..."
msgstr "Laad staat..."
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
>>>>>>> Update translation files for recent changes in the code.
#, fuzzy
msgid "Load Wii System Menu"
msgstr "Laad Wii System Menu(%d %c)"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
>>>>>>> Update translation files for recent changes in the code.
#, fuzzy, c-format
msgid "Load Wii System Menu %d%c"
msgstr "Laad Wii System Menu(%d %c)"
@@ -3397,7 +3521,11 @@ msgstr "MMU Snelheids Hack"
msgid "MadCatz Gameshark files(*.gcs)"
msgstr "MadCatz Gameshark bestanden(*.gcs)"
<<<<<<< HEAD
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
=======
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
>>>>>>> Update translation files for recent changes in the code.
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
msgid "Main Stick"
msgstr ""
@@ -3428,7 +3556,11 @@ msgid "Memory Byte"
msgstr "Geheugen Byte"
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
>>>>>>> Update translation files for recent changes in the code.
msgid "Memory Card"
msgstr "Geheugen Kaart"
@@ -3627,7 +3759,11 @@ msgstr "NP Tab"
msgid "NP Up"
msgstr "NP Omhoog"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
>>>>>>> Update translation files for recent changes in the code.
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
msgid "Name:"
@@ -3714,7 +3850,11 @@ msgstr "Niet gelijk"
msgid "Not Set"
msgstr "Niet ingesteld"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/Main.cpp:596
=======
#: Source/Core/DolphinWX/Src/Main.cpp:597
>>>>>>> Update translation files for recent changes in the code.
msgid "Not connected"
msgstr "Niet verbonden"
@@ -3775,7 +3915,10 @@ msgstr "Er zijn maar %d blocks beschikaarr"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
=======
>>>>>>> Update translation files for recent changes in the code.
msgid "Open"
msgstr "Open"
@@ -3907,8 +4050,13 @@ msgstr "Patches"
msgid "Paths"
msgstr "Pad"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1605
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1606
>>>>>>> Update translation files for recent changes in the code.
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
msgid "Pause"
msgstr "Pauze"
@@ -3928,8 +4076,13 @@ msgstr "Perspectief %d"
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
>>>>>>> Update translation files for recent changes in the code.
msgid "Play"
msgstr "Speel"
@@ -3955,7 +4108,11 @@ msgstr "Terugspeel Opties"
msgid "Players"
msgstr "Spelers"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
>>>>>>> Update translation files for recent changes in the code.
msgid "Please confirm..."
msgstr "Bevestig alsjeblieft..."
@@ -4168,10 +4325,17 @@ msgstr "Lijst Verversen"
msgid "Refresh game list"
msgstr "Ververs de speellijst"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:412
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:434
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:748
>>>>>>> Update translation files for recent changes in the code.
msgid "Remove"
msgstr "Verwijder"
@@ -4191,7 +4355,10 @@ msgid "Render to Main Window"
msgstr "Geef weer op hoofdscherm"
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
=======
>>>>>>> Update translation files for recent changes in the code.
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
msgid "Reset"
msgstr "Opnieuw"
@@ -4234,7 +4401,11 @@ msgstr "S&la Staat Op"
msgid "Safe"
msgstr "Opslaan"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
>>>>>>> Update translation files for recent changes in the code.
msgid "Sample Rate:"
msgstr "Sample Rate:"
@@ -4319,7 +4490,11 @@ msgstr "Save staat film %s is corrupt, het opnemen van de film is gestopt..."
msgid "Scaled EFB Copy"
msgstr "EFB Verkleinde Kopie"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
=======
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
>>>>>>> Update translation files for recent changes in the code.
#, c-format
msgid "Scanning %s"
msgstr "Scannen van %s"
@@ -4359,12 +4534,21 @@ msgstr "Sectie %s niet gevonden in SYSCONF"
msgid "Select"
msgstr "Selecteer"
<<<<<<< HEAD
#: 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
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
msgid "Select The Recording File"
msgstr "Selecteer de opname Bestand"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
>>>>>>> Update translation files for recent changes in the code.
msgid "Select a Wii WAD file to install"
msgstr "Selecteer een Wii WAD bestand om te installeren"
@@ -4390,6 +4574,7 @@ msgstr "Selecteer zwevende vensters"
msgid "Select the file to load"
msgstr "Selecteer het bestand om het te laden"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
msgid "Select the save file"
msgstr "Selecteer het save - bestand"
@@ -4399,6 +4584,17 @@ msgid "Select the state to load"
msgstr "Selecteer de Staat om te laden"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
msgid "Select the save file"
msgstr "Selecteer het save - bestand"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
msgid "Select the state to load"
msgstr "Selecteer de Staat om te laden"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
>>>>>>> Update translation files for recent changes in the code.
msgid "Select the state to save"
msgstr "Selecteer de Staat om op te slaan"
@@ -4771,9 +4967,15 @@ msgstr "Het aanmaken van de geluids buffer is mislukt: %s"
msgid "Space"
msgstr "Ruimte"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:479
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:310
>>>>>>> Update translation files for recent changes in the code.
msgid "Spanish"
msgstr "Spaans"
@@ -4817,7 +5019,11 @@ msgstr ""
msgid "Standard Controller"
msgstr ""
<<<<<<< HEAD
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
=======
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
>>>>>>> Update translation files for recent changes in the code.
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
msgid "Start"
@@ -4852,7 +5058,10 @@ msgstr ""
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
=======
>>>>>>> Update translation files for recent changes in the code.
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
msgid "Stop"
msgstr "Stop"
@@ -4924,7 +5133,10 @@ msgstr "Rechter Tabel"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:368
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
=======
>>>>>>> Update translation files for recent changes in the code.
msgid "Take Screenshot"
msgstr "Neem een Schermafdruk"
@@ -5170,12 +5382,19 @@ msgstr "Zet Alle Log Types Aan"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
=======
>>>>>>> Update translation files for recent changes in the code.
msgid "Toggle Fullscreen"
msgstr "Volledig Scherm Inschakelen"
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
>>>>>>> Update translation files for recent changes in the code.
msgid "Top"
msgstr "Boven"
@@ -5285,6 +5504,18 @@ msgstr ""
"Onbekend bericht ontvagen met id : %d ontvangen van speler: %d Speler "
"eruitgeschopt!"
<<<<<<< HEAD
=======
#: Source/Core/Core/Src/HW/Memmap.cpp:633
#, c-format
msgid ""
"Unknown pointer %#08x\n"
"Continue?"
msgstr ""
"Onbekende pointer %#08x\n"
"Doorgaan?"
>>>>>>> Update translation files for recent changes in the code.
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
msgid "Up"
@@ -5508,7 +5739,11 @@ msgstr "Wii NAND basismap:"
msgid "Wii Save Import"
msgstr "Wii Save Importeren"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
>>>>>>> Update translation files for recent changes in the code.
msgid "Wii save files (*.bin)|*.bin"
msgstr "Wii save bestanden (*.bin)|*.bin"
@@ -5539,7 +5774,11 @@ msgstr ""
"of misschien is het te wijten aan een time-out of een andere reden.\n"
"Wilt u meteen opnieuw verbinden?"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/Main.cpp:598
=======
#: Source/Core/DolphinWX/Src/Main.cpp:599
>>>>>>> Update translation files for recent changes in the code.
msgid "Wiimote Connected"
msgstr "Wiimote Connected"
@@ -5572,9 +5811,15 @@ msgstr "Venster Rechts"
msgid "Word Wrap"
msgstr "Regelafbreking"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1364
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1194
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1327
>>>>>>> Update translation files for recent changes in the code.
msgid "Working..."
msgstr "Werken..."