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

Update from master branch.

Browse Source 
Update Arabic, Hungarian, and Spanish translations.
This commit is contained in:
Glenn Rice
2012-03-09 17:46:28 -06:00
parent 6961c2e553
commit 7306257c0f
23 changed files with 7012 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Languages/po/de.po
+250 -1
View File
@@ -8,10 +8,14 @@ msgstr ""
"Project-Id-Version: Dolphin Emu\n"
"Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
<<<<<<< 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.
=======
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
>>>>>>> Update from master branch.
"PO-Revision-Date: 2011-02-17 01:23+0100\n"
"Last-Translator: LucasX <[email protected]>\n"
"Language-Team: \n"
@@ -555,6 +559,7 @@ msgstr "Patch hinzufügen"
msgid "Add new pane"
msgstr "Neue Palette hinzufügen"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
#: 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/ConfigMain.cpp:747
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:751
>>>>>>> Update from master branch.
msgid "Add..."
msgstr "Hinzufügen..."
@@ -632,6 +642,7 @@ msgstr "Alle GC/Wii Images (gcm, iso, ciso, gcz)"
msgid "All Gamecube GCM files (gcm)"
msgstr "Alle Gamecube GCM Dateien (gcm)"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
#: 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:1473
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1489
>>>>>>> Update from master branch.
msgid "All Save States (sav, s##)"
msgstr "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 ""
"Soll die Datei gelöscht werden? Löschen kann nicht Rückgängig gemacht werden."
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:725
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
msgid "Aspect Ratio:"
msgstr "Seitenverhältnis:"
@@ -746,11 +765,15 @@ msgstr "Audio Backend:"
msgid "AudioCommon: Error opening AO device.\n"
msgstr "AudioCommon: Fehler beim öffnen des AO-Gerätes.\n"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:238
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
msgid "Auto"
msgstr "Automatisch"
@@ -865,10 +888,14 @@ msgstr "Blau rechts"
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:272
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
>>>>>>> Update from master branch.
msgid "Bottom"
msgstr "Unten"
@@ -901,11 +928,15 @@ msgstr "Ausgabeverzeichnis auswählen"
msgid "Buffer:"
msgstr "Buffer:"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
=======
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:68
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:23
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:89
msgid "Buttons"
@@ -1145,10 +1176,14 @@ msgstr ""
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:213
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:244
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:559
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
msgid "Close"
msgstr "Schließen"
@@ -1258,11 +1293,15 @@ msgstr "Wiimote 3 verbinden"
msgid "Connect Wiimote 4"
msgstr "Wiimote 4 verbinden"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/Main.cpp:597
=======
#: Source/Core/DolphinWX/Src/Main.cpp:598
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/Main.cpp:597
>>>>>>> Update from master branch.
msgid "Connecting..."
msgstr "Verbinden..."
@@ -1455,10 +1494,14 @@ msgstr "DSP Emulator Engine"
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:249
>>>>>>> Update from master branch.
msgid "DSP HLE emulation (fast)"
msgstr "DSP HLE Emulation (schnell)"
@@ -1675,11 +1718,15 @@ msgstr ""
msgid "Divide"
msgstr "Dividieren"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
>>>>>>> Update from master branch.
msgid "Do you want to stop the current emulation?"
msgstr "Laufende Emulation stoppen?"
@@ -1709,6 +1756,7 @@ msgstr "Dolphin Emulierte-Wiimote Einstellungen"
msgid "Dolphin FIFO"
msgstr "Dolphin"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
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:1144
>>>>>>> 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)"
msgstr "Dolphin TAS Filme (*.dtm)"
@@ -1811,6 +1867,7 @@ msgid ""
"If unsure, leave this unchecked."
msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
#: 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:294
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:295
>>>>>>> Update from master branch.
msgid "Dutch"
msgstr "Holländisch"
@@ -1948,22 +2010,32 @@ msgid "Enable Block Merging"
msgstr "Blockvereinigung aktivieren"
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
msgid "Enable Bounding Box Calculation"
msgstr ""
<<<<<<< HEAD
=======
>>>>>>> Update translation files for recent changes in the code.
=======
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
#, fuzzy
msgid "Enable Cache"
msgstr "Cache verwenden"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:536
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:540
>>>>>>> Update from master branch.
msgid "Enable Cheats"
msgstr "Cheats aktivieren"
@@ -2102,6 +2174,7 @@ msgstr ""
msgid "End"
msgstr "Ende"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
#: 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:295
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:296
>>>>>>> Update from master branch.
msgid "English"
msgstr "Englisch"
@@ -2140,6 +2218,7 @@ msgstr "Gleich"
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
msgid "Error"
msgstr "Fehler"
@@ -2157,6 +2236,19 @@ msgid "Error"
msgstr "Fehler"
>>>>>>> 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
msgid "Error loading selected language. Falling back to system default."
msgstr ""
@@ -2617,6 +2709,7 @@ msgstr ""
msgid "Free Look"
msgstr "Frei Umsehen"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
#: 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:296
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:297
>>>>>>> Update from master branch.
msgid "French"
msgstr "Französisch"
@@ -2695,10 +2793,14 @@ msgstr "Gamecube-&Pad Einstellungen"
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1011
>>>>>>> Update from master branch.
msgid "Gamecube Memory Cards (*.raw,*.gcp)"
msgstr "Gamecube Memory Cards (*.raw,*.gcp)"
@@ -2723,11 +2825,16 @@ msgstr ""
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:176
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:525
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:176
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:529
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:204
msgid "General"
msgstr "Allgemein"
@@ -2737,6 +2844,7 @@ msgstr "Allgemein"
msgid "General Settings"
msgstr "Interface Einstellungen"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
#: 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:297
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:298
>>>>>>> Update from master branch.
msgid "German"
msgstr "Deutsch"
@@ -2871,11 +2984,16 @@ msgstr "Tastenkürzel Einstellungen"
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:570
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:574
>>>>>>> Update from master branch.
msgid "Hotkeys"
msgstr "Tastenkürzel"
@@ -3090,11 +3208,15 @@ msgstr ""
"InstallExceptionHandler aufgerufen, aber diese Platform unterstüzt diesn "
"noch nicht."
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
>>>>>>> Update from master branch.
#, fuzzy
msgid "Installing WAD..."
msgstr "WAD ins Wii-Menü installieren..."
@@ -3180,6 +3302,7 @@ msgstr "Ungültige Aufnahmedatei"
msgid "Invalid state"
msgstr "Ungültiger Status"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
#: 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:301
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:302
>>>>>>> Update from master branch.
msgid "Italian"
msgstr "Italienisch"
@@ -3347,20 +3475,28 @@ msgstr "Status aus Slot 8 laden"
msgid "Load State..."
msgstr "Status laden..."
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
>>>>>>> Update from master branch.
#, fuzzy
msgid "Load Wii System Menu"
msgstr "Wii-Menü laden (%d %c)"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
>>>>>>> Update from master branch.
#, fuzzy, c-format
msgid "Load Wii System Menu %d%c"
msgstr "Wii-Menü laden (%d %c)"
@@ -3445,11 +3581,15 @@ msgstr "MMU Speed Hack"
msgid "MadCatz Gameshark files(*.gcs)"
msgstr "MadCatz Gameshark Dateien(*.gcs)"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
=======
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:73
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/TASInputDlg.cpp:47
msgid "Main Stick"
msgstr "Main Stick"
@@ -3482,10 +3622,14 @@ msgstr "Speicher"
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:84
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
>>>>>>> Update from master branch.
msgid "Memory Card"
msgstr "Memory Card"
@@ -3672,11 +3816,15 @@ msgstr "NP Tab"
msgid "NP Up"
msgstr "NP Hoch"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:58
#: Source/Core/DolphinWX/Src/ARCodeAddEdit.cpp:49
msgid "Name:"
@@ -3764,11 +3912,15 @@ msgstr "Ungleich"
msgid "Not Set"
msgstr "Nicht Festgelegt"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/Main.cpp:596
=======
#: Source/Core/DolphinWX/Src/Main.cpp:597
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/Main.cpp:596
>>>>>>> Update from master branch.
msgid "Not connected"
msgstr "Nicht Verbunden"
@@ -3830,9 +3982,13 @@ msgstr "Nur %d Blöcke verfügbar"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
=======
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:182
>>>>>>> Update from master branch.
msgid "Open"
msgstr "Öffnen"
@@ -3964,6 +4120,7 @@ msgstr "Patches"
msgid "Paths"
msgstr "Pfade"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
#: 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:1606
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1622
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:48
msgid "Pause"
msgstr "Pause"
@@ -3992,12 +4153,17 @@ msgstr "Perspektive %d"
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1630
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1631
>>>>>>> Update from master branch.
msgid "Play"
msgstr "Start"
@@ -4024,11 +4190,15 @@ msgstr "Optionen"
msgid "Players"
msgstr "Spieler"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
>>>>>>> Update from master branch.
msgid "Please confirm..."
msgstr "Bitte Bestätigen..."
@@ -4244,6 +4414,7 @@ msgstr "Liste aktualisieren"
msgid "Refresh game list"
msgstr "Spieleliste aktualisieren"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
#: 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/ConfigMain.cpp:748
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
#: Source/Core/DolphinWX/Src/PatchAddEdit.cpp:76
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:752
>>>>>>> Update from master branch.
msgid "Remove"
msgstr "Entfernen"
@@ -4274,9 +4451,13 @@ msgstr "Im Hauptfenster Rendern"
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
=======
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
msgid "Reset"
msgstr "Zurücksetzen"
@@ -4319,11 +4500,15 @@ msgstr "S&tatus speichern"
msgid "Safe"
msgstr "Sicher"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:632
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:636
>>>>>>> Update from master branch.
msgid "Sample Rate:"
msgstr "Abtastrate:"
@@ -4408,11 +4593,15 @@ msgstr "Film-Status %s ist fehlerhaft, breche die Filmaufnahme ab..."
msgid "Scaled EFB Copy"
msgstr "EFB Scaled Copy"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
=======
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
>>>>>>> Update from master branch.
#, fuzzy, c-format
msgid "Scanning %s"
msgstr "Suche..."
@@ -4452,6 +4641,7 @@ msgstr "Ausgewähltes %s nicht gefunden in SYSCONF"
msgid "Select"
msgstr "Auswählen"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
@@ -4467,6 +4657,14 @@ msgstr "Aufnahmedatei auswählen"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
msgid "Select The Recording File"
msgstr "Aufnahmedatei auswählen"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
>>>>>>> Update from master branch.
#, fuzzy
msgid "Select a Wii WAD file to install"
msgstr "Speicherdatei zum Importieren auswählen"
@@ -4493,6 +4691,7 @@ msgstr "Wähle unverankerte Fenster"
msgid "Select the file to load"
msgstr "Datei zum Laden auswählen"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
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:1308
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
>>>>>>> Update from master branch.
msgid "Select the save file"
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"
msgstr "Status zum Laden auswählen"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
>>>>>>> Update from master branch.
msgid "Select the state to save"
msgstr "Status zum Speichern auswählen"
@@ -4869,6 +5075,7 @@ msgstr "Erstellen des Sound-Buffer fehlgeschlagen: %s"
msgid "Space"
msgstr "Leertaste"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
#: 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:310
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:311
>>>>>>> Update from master branch.
msgid "Spanish"
msgstr "Spanisch"
@@ -4913,11 +5125,15 @@ msgstr ""
msgid "Standard Controller"
msgstr "Standard-Controller"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
=======
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:38
#: Source/Core/DolphinWX/Src/NetWindow.cpp:309
msgid "Start"
@@ -4953,9 +5169,13 @@ msgstr "Stick"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
=======
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:187
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/NetWindow.cpp:312
msgid "Stop"
msgstr "Stopp"
@@ -5029,9 +5249,13 @@ msgstr ""
#: Source/Core/DolphinWX/Src/FrameTools.cpp:440
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
=======
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:197
>>>>>>> Update from master branch.
msgid "Take Screenshot"
msgstr "Screenshot erstellen"
@@ -5278,18 +5502,26 @@ msgstr "Alle umschalten"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
=======
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
>>>>>>> Update from master branch.
msgid "Toggle Fullscreen"
msgstr "Vollbildmodus wechseln"
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:274
>>>>>>> Update from master branch.
msgid "Top"
msgstr "Oben"
@@ -5394,6 +5626,7 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!"
msgstr ""
"Unbekannte Meldung mit ID %d erhalten von Spieler %d, Spieler herausgeworfen!"
<<<<<<< HEAD
<<<<<<< HEAD
=======
#: Source/Core/Core/Src/HW/Memmap.cpp:633
@@ -5406,6 +5639,8 @@ msgstr ""
"Fortfahren?"
>>>>>>> Update translation files for recent changes in the code.
=======
>>>>>>> Update from master branch.
#: Source/Core/InputCommon/Src/ControllerEmu.cpp:274
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
msgid "Up"
@@ -5616,11 +5851,15 @@ msgstr "DVD Laufwerk:"
msgid "Wii Save Import"
msgstr "Wii Spielstand importieren"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1310
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
>>>>>>> Update from master branch.
msgid "Wii save files (*.bin)|*.bin"
msgstr "Wii Speicherdateien (*.bin)|*.bin"
@@ -5651,11 +5890,15 @@ msgstr ""
"oder die Wiimote war zulange inaktiv oder andere Ursachen.\n"
"Soll die Wiimote jetzt wieder verbunden werden?"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/Main.cpp:598
=======
#: Source/Core/DolphinWX/Src/Main.cpp:599
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/Main.cpp:598
>>>>>>> Update from master branch.
msgid "Wiimote Connected"
msgstr "Wiimote Verbunden"
@@ -5688,6 +5931,7 @@ msgstr "Windows Rechts"
msgid "Word Wrap"
msgstr "Zeilenumbruch"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
#: 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:1327
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1282
>>>>>>> Update from master branch.
msgid "Working..."
msgstr "Arbeite..."