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/sr.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-03-02 21:58+0100\n"
"Last-Translator: nikolassj\n"
"Language-Team: \n"
@@ -512,6 +516,7 @@ msgstr "Dodaj Patch "
msgid "Add new pane"
msgstr "Dodaj nova okna"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:415
#: 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/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 "Dodaj..."
@@ -574,6 +584,7 @@ msgstr ""
msgid "All Gamecube GCM files (gcm)"
msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1475
#: 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: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 ""
@@ -660,11 +675,15 @@ msgstr ""
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!"
<<<<<<< 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 ""
@@ -685,11 +704,15 @@ msgstr ""
msgid "AudioCommon: Error opening AO device.\n"
msgstr ""
<<<<<<< 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 "Auto"
@@ -801,10 +824,14 @@ msgstr "Blue right "
#: 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 "Donji deo/dno"
@@ -837,11 +864,15 @@ msgstr ""
msgid "Buffer:"
msgstr ""
<<<<<<< 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"
@@ -1069,10 +1100,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 "Zatvori"
@@ -1181,11 +1216,15 @@ msgstr ""
msgid "Connect Wiimote 4"
msgstr ""
<<<<<<< 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 "Povezivanje..."
@@ -1361,10 +1400,14 @@ msgstr ""
#: 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 ""
@@ -1576,11 +1619,15 @@ msgstr ""
msgid "Divide"
msgstr ""
<<<<<<< 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 ""
@@ -1610,6 +1657,7 @@ msgstr ""
msgid "Dolphin FIFO"
msgstr "Dolphin"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
msgid "Dolphin GCPad Configuration"
@@ -1625,6 +1673,14 @@ msgstr ""
#: 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 ""
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
>>>>>>> Update from master branch.
msgid "Dolphin TAS Movies (*.dtm)"
msgstr ""
@@ -1707,6 +1763,7 @@ msgid ""
"If unsure, leave this unchecked."
msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:485
#: 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: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 ""
@@ -1839,21 +1901,31 @@ msgid "Enable Block Merging"
msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:328
msgid "Enable Bounding Box Calculation"
msgstr ""
<<<<<<< HEAD
=======
>>>>>>> Update translation files for recent changes in the code.
=======
>>>>>>> Update from master branch.
#: Source/Core/DolphinWX/Src/VideoConfigDiag.cpp:440
msgid "Enable Cache"
msgstr ""
<<<<<<< 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 ""
@@ -1979,6 +2051,7 @@ msgstr ""
msgid "End"
msgstr "Kraj"
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:480
#: 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: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 ""
@@ -2017,6 +2095,7 @@ msgstr ""
#: 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 "Error"
@@ -2034,6 +2113,19 @@ msgid "Error"
msgstr "Error"
>>>>>>> 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
msgid "Error loading selected language. Falling back to system default."
msgstr ""
@@ -2450,6 +2542,7 @@ msgstr ""
msgid "Free Look"
msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:482
#: 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: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 ""
@@ -2527,10 +2625,14 @@ msgstr ""
#: 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 ""
@@ -2552,11 +2654,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 ""
@@ -2566,6 +2673,7 @@ msgstr ""
msgid "General Settings"
msgstr "Opcije Uredjaja "
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:481
#: 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: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 "Nemacki "
@@ -2692,11 +2805,16 @@ msgstr ""
#: 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 ""
@@ -2892,11 +3010,15 @@ msgid ""
"InstallExceptionHandler called, but this platform does not yet support it."
msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1363
>>>>>>> Update translation files for recent changes in the code.
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1379
>>>>>>> Update from master branch.
msgid "Installing WAD..."
msgstr ""
@@ -2974,6 +3096,7 @@ msgstr ""
msgid "Invalid state"
msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:484
#: 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: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 "Italianski "
@@ -3134,20 +3262,28 @@ msgstr "Ucitaj State Slot 8"
msgid "Load State..."
msgstr "Ucitaj State"
<<<<<<< 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 "Ucitaj Wii Sistem Meni (%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 "Ucitaj Wii Sistem Meni (%d %c)"
@@ -3224,11 +3360,15 @@ msgstr ""
msgid "MadCatz Gameshark files(*.gcs)"
msgstr ""
<<<<<<< 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 ""
@@ -3261,10 +3401,14 @@ msgstr "&Memorija"
#: 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 ""
@@ -3441,11 +3585,15 @@ msgstr ""
msgid "NP Up"
msgstr ""
<<<<<<< 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:"
@@ -3532,11 +3680,15 @@ msgstr ""
msgid "Not Set"
msgstr ""
<<<<<<< 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 ""
@@ -3598,9 +3750,13 @@ msgstr ""
#: 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 "Otvori "
@@ -3726,6 +3882,7 @@ msgstr ""
msgid "Paths"
msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1621
#: 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: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 "Pauza "
@@ -3754,12 +3915,17 @@ msgstr ""
#: 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 "Pokreni "
@@ -3786,11 +3952,15 @@ msgstr "Opcije "
msgid "Players"
msgstr ""
<<<<<<< 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 ""
@@ -3998,6 +4168,7 @@ msgstr ""
msgid "Refresh game list"
msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:416
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:438
@@ -4009,6 +4180,12 @@ msgstr ""
#: 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 ""
@@ -4025,9 +4202,13 @@ msgstr ""
#: 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 "Reset/Restart "
@@ -4070,11 +4251,15 @@ msgstr ""
msgid "Safe"
msgstr "Siguran "
<<<<<<< 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 ""
@@ -4158,11 +4343,15 @@ msgstr ""
msgid "Scaled EFB Copy"
msgstr ""
<<<<<<< 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 "Skeniranje..."
@@ -4202,6 +4391,7 @@ msgstr ""
msgid "Select"
msgstr "Izaberi "
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
@@ -4217,6 +4407,14 @@ msgstr "Izaberi Snimani fajl"
#: 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 "Izaberi Snimani fajl"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
>>>>>>> Update from master branch.
#, fuzzy
msgid "Select a Wii WAD file to install"
msgstr "Izaberi \"Snimani fajl/Save file\" za importovanje "
@@ -4243,6 +4441,7 @@ msgstr ""
msgid "Select the file to load"
msgstr "Izaberi fajl za ucitavanje "
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
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:1308
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
>>>>>>> Update from master branch.
msgid "Select the save file"
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"
msgstr "Izaberi state za ucitavanje "
<<<<<<< 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 "Izaberi state za snimanje/save"
@@ -4599,6 +4805,7 @@ msgstr ""
msgid "Space"
msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/ISOProperties.cpp:483
#: 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: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 ""
@@ -4643,11 +4855,15 @@ msgstr ""
msgid "Standard Controller"
msgstr ""
<<<<<<< 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"
@@ -4683,9 +4899,13 @@ msgstr ""
#: 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 " Zaustavi"
@@ -4758,9 +4978,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 ""
@@ -4975,18 +5199,26 @@ msgstr ""
#: 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 ""
#: 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 ""
@@ -5088,6 +5320,7 @@ msgstr ""
msgid "Unknown message with id:%d received from player:%d Kicking player!"
msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
=======
#: Source/Core/Core/Src/HW/Memmap.cpp:633
@@ -5098,6 +5331,8 @@ msgid ""
msgstr ""
>>>>>>> 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"
@@ -5305,11 +5540,15 @@ msgstr ""
msgid "Wii Save Import"
msgstr ""
<<<<<<< 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 ""
@@ -5336,11 +5575,15 @@ msgid ""
"Do you want to reconnect immediately?"
msgstr ""
<<<<<<< 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 ""
@@ -5373,6 +5616,7 @@ msgstr ""
msgid "Word Wrap"
msgstr ""
<<<<<<< HEAD
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1380
#: 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: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 "Radi..."