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

Update translation files for recent changes in the code.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
Languages/po/ko.po
+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-07-07 10:24+0900\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -549,9 +553,15 @@ msgstr "패치 추가"
msgid "Add new pane"
msgstr "새로운 창 추가"
<<<<<<< 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 "추가..."
@@ -619,8 +629,13 @@ msgstr "모든 GC/Wii 이미지들 (gcm, iso, ciso, gcz)"
msgid "All Gamecube GCM files (gcm)"
msgstr "모든 게임큐브 GCM 파일들 (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 "모든 상태들 저장 (sav, s##)"
@@ -708,7 +723,11 @@ msgstr ""
msgid "Are you sure you want to delete this file? It will be gone forever!"
msgstr "이 파일을 정말로 지우고 싶습니까? 그것은 영원히 사라집니다!"
<<<<<<< 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 "종횡비:"
@@ -729,7 +748,11 @@ msgstr "오디오 백엔드:"
msgid "AudioCommon: Error opening AO device.\n"
msgstr "AudioCommon: AO 장치를 열기 에러.\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 "자동"
@@ -844,7 +867,11 @@ msgid "Blue Right"
msgstr "파랑 오른쪽"
#: 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 "아래"
@@ -877,7 +904,11 @@ msgstr "출력 디렉토리 둘러보기"
msgid "Buffer:"
msgstr "버퍼:"
<<<<<<< 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"
@@ -1118,7 +1149,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 "닫기"
@@ -1227,7 +1262,11 @@ msgstr "위모트 3 연결"
msgid "Connect Wiimote 4"
msgstr "위모트 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 "연결중..."
@@ -1418,7 +1457,11 @@ msgid "DSP Emulator Engine"
msgstr "DSP 에뮬레이터 엔진"
#: 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 에뮬레이션 (빠름)"
@@ -1647,7 +1690,11 @@ msgstr ""
msgid "Divide"
msgstr "나누기"
<<<<<<< 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 "현재 에뮬레이션을 중단하고 싶습니까?"
@@ -1676,12 +1723,21 @@ msgstr "돌핀 에뮬된 위모트 환경설정"
msgid "Dolphin FIFO"
msgstr "돌핀 FIFO"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
msgid "Dolphin GCPad Configuration"
msgstr "돌핀 GC패드 환경설정"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:751
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1160
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1204
msgid "Dolphin GCPad Configuration"
msgstr "돌핀 GC패드 환경설정"
#: 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 "돌핀 TAS 동영상 (*.dtm)"
@@ -1777,9 +1833,15 @@ msgstr ""
"\n"
"확신 없다면, 이것을 언체크로 두세요."
<<<<<<< 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 "네덜란드어"
@@ -1922,15 +1984,22 @@ msgstr "BAT 활성"
msgid "Enable Block Merging"
msgstr "블록 합치기 활성"
<<<<<<< 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
msgid "Enable Cache"
msgstr "캐쉬 활성"
<<<<<<< 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 "치트 활성"
@@ -2081,9 +2150,15 @@ msgstr ""
msgid "End"
msgstr "끝"
<<<<<<< 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 "영어"
@@ -2112,6 +2187,7 @@ msgstr "같음"
#: 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 "에러"
@@ -2123,6 +2199,12 @@ msgid ""
"Sorry, Wii recording is temporarily broken."
msgstr ""
=======
#: Source/Core/DolphinWX/Src/ConfigMain.cpp:1169
msgid "Error"
msgstr "에러"
>>>>>>> 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 "선택된 언어 로딩 에러. 시스템 기본으로 돌아갑니다."
@@ -2577,9 +2659,15 @@ msgstr "녹화할 프레임"
msgid "Free Look"
msgstr "자유로운 보기"
<<<<<<< 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 "프랑스어"
@@ -2646,7 +2734,11 @@ msgid "Gamecube &Pad Settings"
msgstr "게임큐브 패드 설정(&P)"
#: 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 "게임큐브 메모리 카드들 (*.raw,*.gcp)"
@@ -2669,8 +2761,12 @@ msgstr ""
"(잘못된 코드이거나 코드 타입이 아직 지원않된다.)"
#: 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 "일반"
@@ -2679,9 +2775,15 @@ msgstr "일반"
msgid "General Settings"
msgstr "일반 설정"
<<<<<<< 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 "독일어"
@@ -2811,8 +2913,12 @@ msgid "Hotkey Configuration"
msgstr "단축키 설정"
#: 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 "단축키들"
@@ -3034,7 +3140,11 @@ msgstr ""
"InstallExceptionHandler 호출됨, 하지만 이 플랫폼은 아직 그것을 지원하지 않습"
"니다."
<<<<<<< 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 설치하기..."
@@ -3116,9 +3226,15 @@ msgstr "비적합 기록 파일"
msgid "Invalid state"
msgstr "비적합 상태"
<<<<<<< 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 "이탈리아어"
@@ -3276,11 +3392,19 @@ msgstr "슬롯8 상태 로드"
msgid "Load State..."
msgstr "상태 로드..."
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
msgid "Load Wii System Menu"
msgstr "Wii 시스템 메뉴 로드"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
msgid "Load Wii System Menu"
msgstr "Wii 시스템 메뉴 로드"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
>>>>>>> Update translation files for recent changes in the code.
#, c-format
msgid "Load Wii System Menu %d%c"
msgstr "Wii 시스템 메뉴 %d %c 로드"
@@ -3362,7 +3486,11 @@ msgstr "MMU 스피드 핵"
msgid "MadCatz Gameshark files(*.gcs)"
msgstr "MadCatz 게임샤크 파일들(*.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 "메인 스틱"
@@ -3393,7 +3521,11 @@ msgid "Memory Byte"
msgstr "메모리 바이트"
#: 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 "메모리 카드"
@@ -3591,7 +3723,11 @@ msgstr "NP 탭"
msgid "NP Up"
msgstr "NP 위"
<<<<<<< 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:"
@@ -3678,7 +3814,11 @@ msgstr "같지 않음"
msgid "Not Set"
msgstr "설정 안함"
<<<<<<< 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 "연결되지 않음"
@@ -3739,7 +3879,10 @@ msgstr "%d 블럭들만 유용한"
#: 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 "열기"
@@ -3867,8 +4010,13 @@ msgstr "패치"
msgid "Paths"
msgstr "경로"
<<<<<<< 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 "일시정지"
@@ -3888,8 +4036,13 @@ msgstr "관점 %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 " 실행 "
@@ -3915,7 +4068,11 @@ msgstr "재생 옵션"
msgid "Players"
msgstr "플레이어"
<<<<<<< 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 "확인해주세요..."
@@ -4127,10 +4284,17 @@ msgstr "목록 새로 고침"
msgid "Refresh game list"
msgstr "게임 목록 새로 고침"
<<<<<<< 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 "제거"
@@ -4149,7 +4313,10 @@ msgid "Render to Main Window"
msgstr "메인 윈도우에 렌더"
#: 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 "리셋"
@@ -4192,7 +4359,11 @@ msgstr "상태 저장(&v) "
msgid "Safe"
msgstr "안전"
<<<<<<< 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 "샘플율:"
@@ -4276,7 +4447,11 @@ msgstr "%s 영상 상태저장이 손상되었습니다, 영상 기록 중지...
msgid "Scaled EFB Copy"
msgstr "스케일된 EFB 복사"
<<<<<<< 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 "스캐닝 %s"
@@ -4316,12 +4491,21 @@ msgstr "섹션 %s를 SYSCONF에서 찾을 수 없음"
msgid "Select"
msgstr "선택"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:749
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1158
msgid "Select The Recording File"
msgstr "기록 파일 선택"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1367
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:740
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1142
msgid "Select The Recording File"
msgstr "기록 파일 선택"
#: 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 "설치할 Wii WAD 파일 선택"
@@ -4347,6 +4531,7 @@ msgstr "유동적인 윈도우즈 선택"
msgid "Select the file to load"
msgstr "로드할 파일 선택"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
msgid "Select the save file"
msgstr "저장 파일을 선택"
@@ -4356,6 +4541,17 @@ msgid "Select the state to load"
msgstr "로드할 상태 선택"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1487
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1308
msgid "Select the save file"
msgstr "저장 파일을 선택"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1457
msgid "Select the state to load"
msgstr "로드할 상태 선택"
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1471
>>>>>>> Update translation files for recent changes in the code.
msgid "Select the state to save"
msgstr "저장할 상태 선택"
@@ -4730,9 +4926,15 @@ msgstr "사운드 버퍼 생성 실패했습니다: %s"
msgid "Space"
msgstr "스페이스"
<<<<<<< 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 "스페인어"
@@ -4776,7 +4978,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"
@@ -4811,7 +5017,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 "중지"
@@ -4887,7 +5096,10 @@ msgstr "테이블 오른쪽"
#: 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 "스크린샷 찍기"
@@ -5129,12 +5341,19 @@ msgstr "모든 로그 타입 토글"
#: 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 "전체화면 토글"
#: 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 "위"
@@ -5242,6 +5461,18 @@ msgid "Unknown message with id:%d received from player:%d Kicking player!"
msgstr ""
"id:%d의 알려지지 않은 메시지, 플레이어:%d 플레이어 킥킹으로 부터 전달된!"
<<<<<<< HEAD
=======
#: Source/Core/Core/Src/HW/Memmap.cpp:633
#, c-format
msgid ""
"Unknown pointer %#08x\n"
"Continue?"
msgstr ""
"알려지지 않은 포인터 %#08x\n"
"계속합니까?"
>>>>>>> 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"
@@ -5463,7 +5694,11 @@ msgstr "Wii NAND 루트:"
msgid "Wii Save Import"
msgstr "Wii 저장 가져오기"
<<<<<<< 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 저장 파일들 (*.bin)|*.bin"
@@ -5494,7 +5729,11 @@ msgstr ""
"혹은 아마도 아이들 타임 아웃이거나 다른 원인 때문인 것 같습니다.\n"
"당신은 즉시 재연결 하고 싶습니까?"
<<<<<<< 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 "위모트가 연결됨"
@@ -5527,9 +5766,15 @@ msgstr "윈도우즈 오른쪽"
msgid "Word Wrap"
msgstr "자동 줄바꿈"
<<<<<<< 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 "작동중..."