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/cs.po
+247 -3
View File
@@ -10,6 +10,7 @@ msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"POT-Creation-Date: 2011-12-18 13:39-0600\n"
<<<<<<< HEAD
"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"
>>>>>>> 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 <[email protected]>\n"
"Language-Team: \n"
"Language: Czech\n"
@@ -562,6 +567,7 @@ msgstr "Přidat nový panel"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:437
#: 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/ConfigMain.cpp:747
>>>>>>> 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..."
msgstr "Přidat..."
@@ -646,6 +657,7 @@ msgstr "Všechny soubory Gamecube GCM )gcm)"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
#: 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:1473
>>>>>>> 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##)"
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!"
msgstr "Opravdu chcete smazat tento soubor? Bude navždy ztracen!"
<<<<<<< HEAD
<<<<<<< HEAD
#: 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
>>>>>>> Update Greek and Czech translations
=======
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:729
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:284
>>>>>>> The actual update of the Greek and Czech translations. The last commit
msgid "Aspect Ratio:"
@@ -795,6 +815,7 @@ msgstr "Backend Zvuku:"
msgid "AudioCommon: Error opening AO device.\n"
msgstr "AudioCommon: Chyba při otevírání zařízení zvukového výstupu.\n"
<<<<<<< HEAD
<<<<<<< HEAD
#: 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
>>>>>>> Update Greek and Czech translations
=======
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:239
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:282
>>>>>>> The actual update of the Greek and Czech translations. The last commit
msgid "Auto"
@@ -925,6 +949,7 @@ msgstr "Modrá vpravo"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
=======
#: 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/ConfigMain.cpp:272
>>>>>>> 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"
msgstr "Dole"
@@ -972,6 +1000,7 @@ msgstr "Vyrovnávací paměť:"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:71
=======
#: 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
#: 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/TASInputDlg.cpp:89
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/MemcardManager.cpp:244
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
=======
#: 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
>>>>>>> Update Greek and Czech translations
=======
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:563
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:592
>>>>>>> The actual update of the Greek and Czech translations. The last commit
msgid "Close"
@@ -1339,6 +1375,7 @@ msgstr "Připojit Wiimote 4"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/Main.cpp:597
=======
#: Source/Core/DolphinWX/Src/Main.cpp:598
@@ -1349,6 +1386,9 @@ msgstr "Připojit Wiimote 4"
=======
#: Source/Core/DolphinWX/Src/Main.cpp:598
>>>>>>> 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..."
msgstr "Připojuji..."
@@ -1541,8 +1581,12 @@ msgstr "Jádro Emulátoru DSP"
>>>>>>> Update Greek and Czech translations
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:319
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:248
>>>>>>> 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)"
msgstr "DSP HLE emulace (rychlé)"
@@ -1766,6 +1810,7 @@ msgstr "Rozdělit"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1068
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
@@ -1776,6 +1821,9 @@ msgstr "Rozdělit"
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1052
>>>>>>> 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?"
msgstr "Chcete současnou emulaci zastavit?"
@@ -1807,6 +1855,7 @@ msgstr "Dolphin FIFO"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
msgid "Dolphin GCPad Configuration"
msgstr "Dolphin GCPad Nastavení"
@@ -1835,6 +1884,14 @@ msgstr "Dolphin GCPad Nastavení"
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1144
>>>>>>> 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)"
msgstr "Doplhin Filmy TAS (*.dtm)"
@@ -1925,6 +1982,7 @@ msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:268
#: 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:294
>>>>>>> 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"
msgstr "Nizozemština"
@@ -2073,18 +2136,25 @@ msgstr "Zapnout Slučování Bloků"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
msgid "Enable Bounding Box Calculation"
msgstr "Povolit výpočet ohraničujícího rámečku"
<<<<<<< HEAD
=======
>>>>>>> Update translation files for recent changes in the code.
=======
>>>>>>> The actual update of the Greek and Czech translations. The last commit
=======
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
msgid "Enable Cache"
msgstr "Povolit vyrovnávací paměť"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: 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
#: 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 "Povolit Cheaty"
@@ -2232,6 +2305,7 @@ msgstr "End"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:263
#: 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:295
>>>>>>> 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"
msgstr "Angličtina"
@@ -2303,13 +2382,25 @@ msgstr ""
>>>>>>> The actual update of the Greek and Czech translations. The last commit
#: Source/Core/DolphinWX/Src/LogConfigWindow.cpp:47
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:153
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1175
msgid "Error"
msgstr "Chyba"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 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:356
@@ -2765,6 +2856,7 @@ msgstr "Rozhlížení pomocí myši"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:265
#: 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:296
>>>>>>> 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"
msgstr "Francouzština"
@@ -2861,8 +2958,12 @@ msgstr "Nastavení Gamecube &Pad"
>>>>>>> Update Greek and Czech translations
=======
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:215
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1007
>>>>>>> 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)"
msgstr "Paměťové karty Gamecube (*.raw,*.gcp)"
@@ -2901,7 +3002,8 @@ msgstr ""
>>>>>>> Update Greek and Czech translations
=======
#: 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
>>>>>>> The actual update of the Greek and Czech translations. The last commit
msgid "General"
@@ -2914,6 +3016,7 @@ msgstr "Obecná Nastavení"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:264
#: 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:297
>>>>>>> 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"
msgstr "Němčina"
@@ -3073,6 +3181,7 @@ msgstr "Nastavení klávesových zkratek"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:276
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:276
#: 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/ConfigMain.cpp:570
>>>>>>> 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"
msgstr "Klávesové zkratky"
@@ -3289,6 +3402,7 @@ msgstr "Byl zavolán InstallExceptionHandler, ale tato platforma toto ještě ne
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
=======
#: 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
>>>>>>> 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..."
msgstr "Instaluji WAD..."
@@ -3383,6 +3500,7 @@ msgstr "Neplatný stav"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:267
#: 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:301
>>>>>>> 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"
msgstr "Italština"
@@ -3561,6 +3684,7 @@ msgstr "Nahrát Stav..."
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
msgid "Load Wii System Menu"
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
>>>>>>> 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
msgid "Load Wii System Menu %d%c"
msgstr "Nahrát Systémové Menu Wii %d%c"
@@ -3671,6 +3802,7 @@ msgstr "Soubory MadCatz Gameshark (*.gcs)"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:76
=======
#: 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
#: 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
msgid "Main Stick"
msgstr "Hlavní Stick"
@@ -3714,6 +3849,7 @@ msgstr "Bajt Paměti"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/MemcardManager.cpp:222
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:85
=======
#: 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/ConfigMain.cpp:84
>>>>>>> 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"
msgstr "Paměťová karta"
@@ -3916,6 +4055,7 @@ msgstr "NK Nahoru"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:455
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
@@ -3925,6 +4065,9 @@ msgstr "NK Nahoru"
=======
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:451
>>>>>>> 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/ARCodeAddEdit.cpp:49
msgid "Name:"
@@ -4014,6 +4157,7 @@ msgstr "Nenastaven"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/Main.cpp:596
=======
#: Source/Core/DolphinWX/Src/Main.cpp:597
@@ -4024,6 +4168,9 @@ msgstr "Nenastaven"
=======
#: Source/Core/DolphinWX/Src/Main.cpp:597
>>>>>>> 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"
msgstr "Nepřipojen"
@@ -4095,7 +4242,11 @@ msgstr "Pouze bloky %d jsou dostupné"
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:433
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:182
<<<<<<< HEAD
>>>>>>> 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"
msgstr "Otevřít"
@@ -4225,6 +4376,7 @@ msgstr "Cesty"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
#: 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:1606
>>>>>>> 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
msgid "Pause"
msgstr "Pozastavit"
@@ -4272,9 +4428,14 @@ msgstr "Perspektiva %d"
=======
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:153
#: Source/Core/DolphinWX/Src/FrameTools.cpp:437
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1614
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1615
>>>>>>> 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"
msgstr "Spustit"
@@ -4303,6 +4464,7 @@ msgstr "Hráči"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1069
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
@@ -4313,6 +4475,9 @@ msgstr "Hráči"
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1053
>>>>>>> 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..."
msgstr "Prosím potvrďte..."
@@ -4526,6 +4691,7 @@ msgstr "Obnovit seznam her"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
#: 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/ConfigMain.cpp:748
>>>>>>> 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"
msgstr "Odstranit"
@@ -4578,6 +4750,7 @@ msgstr "Vykreslit do Hlavního okna"
=======
>>>>>>> The actual update of the Greek and Czech translations. The last commit
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:188
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:188
#: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:919
msgid "Reset"
msgstr "Resetovat"
@@ -4624,6 +4797,7 @@ msgstr "Uložit Sta&v"
msgid "Safe"
msgstr "Bezpečná"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: 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
#: 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 "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"
msgstr "EFB Kopie Změněné Velikosti"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: 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
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:598
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:634
>>>>>>> Update from master branch.
#, c-format
msgid "Scanning %s"
msgstr "Skenuji %s"
@@ -4772,6 +4953,7 @@ msgstr "Sekce %s nebyla v SYSCONF nalezena"
msgid "Select"
msgstr "Vybrat"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
@@ -4795,6 +4977,14 @@ msgstr "Vyberte Soubor s Nahrávkou"
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1351
>>>>>>> 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"
msgstr "Vyberte soubor Wii WAD k instalování"
@@ -4823,6 +5013,7 @@ msgstr "Vyberte soubor k nahrání"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
msgid "Select the save file"
msgstr "Vyberte soubor s uloženou hrou"
@@ -4840,13 +5031,17 @@ msgstr "Vyberte stav k nahrání"
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
>>>>>>> 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"
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"
msgstr "Vyberte stav k nahrání"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
@@ -4857,6 +5052,9 @@ msgstr "Vyberte stav k nahrání"
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
>>>>>>> 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"
msgstr "Vyberte stav k uložení"
@@ -5219,6 +5417,7 @@ msgstr "Mezerník"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:266
#: 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:310
>>>>>>> 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"
msgstr "Španělština"
@@ -5275,6 +5479,7 @@ msgstr "Standardní Ovladač"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:50
=======
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
@@ -5284,6 +5489,9 @@ msgstr "Standardní Ovladač"
=======
#: Source/Core/Core/Src/HW/GCPadEmu.cpp:49
>>>>>>> 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/NetWindow.cpp:309
msgid "Start"
@@ -5330,7 +5538,11 @@ msgstr "Stick"
#: Source/Core/DolphinWX/Src/FifoPlayerDlg.cpp:315
#: Source/Core/DolphinWX/Src/FrameTools.cpp:438
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:187
<<<<<<< HEAD
>>>>>>> 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
msgid "Stop"
msgstr "Zastavit"
@@ -5415,7 +5627,11 @@ msgstr "Deska vpravo"
>>>>>>> Update Greek and Czech translations
=======
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:197
<<<<<<< HEAD
>>>>>>> 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"
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
#: Source/Core/DolphinWX/Src/FrameTools.cpp:439
#: Source/Core/DolphinWX/Src/HotkeyDlg.cpp:196
#: Source/Core/DolphinWX/Src/GCMicDlg.cpp:196
msgid "Toggle Fullscreen"
msgstr "Přepnout na Celou Obrazovku"
#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:92
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> Update Greek and Czech translations
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:273
>>>>>>> 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"
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!"
msgstr "Neznámá zpráva s id:%d přijata od hráče:%d Vyhazuji hráče!"
<<<<<<< HEAD
<<<<<<< HEAD
=======
#: Source/Core/Core/Src/HW/Memmap.cpp:633
@@ -5786,6 +6008,8 @@ msgstr ""
#: Source/Core/DolphinWX/Src/WXInputBase.cpp:53
=======
>>>>>>> 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/DolphinWX/Src/WXInputBase.cpp:53
msgid "Up"
@@ -6005,6 +6229,7 @@ msgstr "Import uložených pozic Wii"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1326
=======
#: 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
>>>>>>> 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"
msgstr "Wii soubory s uložením (*.bin)|*.bin"
@@ -6048,6 +6276,7 @@ msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/Main.cpp:598
=======
#: Source/Core/DolphinWX/Src/Main.cpp:599
@@ -6058,6 +6287,9 @@ msgstr ""
=======
#: Source/Core/DolphinWX/Src/Main.cpp:599
>>>>>>> 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"
msgstr "Wiimote Připojen"
@@ -6092,6 +6324,7 @@ msgstr "Zalamování textu"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
#: Source/Core/DolphinWX/Src/GameListCtrl.cpp:1149
#: 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: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 "Pracuji..."
@@ -6714,6 +6952,9 @@ msgstr "| NEBO"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> Update from master branch.
#~ msgid ""
#~ "Unknown pointer %#08x\n"
#~ "Continue?"
@@ -6721,6 +6962,7 @@ msgstr "| NEBO"
#~ "Neznámý ukazatel %#08x\n"
#~ "Pokračovat?"
<<<<<<< HEAD
=======
>>>>>>> Update translation files for recent changes in the code.
=======
@@ -6757,6 +6999,8 @@ msgstr "| NEBO"
>>>>>>> Update Greek and Czech translations
=======
>>>>>>> The actual update of the Greek and Czech translations. The last commit
=======
>>>>>>> Update from master branch.
#~ msgid "Use FPS For Limiting"
#~ msgstr "Použít SzS pro Omezení"