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/zh_TW.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-03-15 02:51+0800\n"
"Last-Translator: khiav <[email protected]>\n"
"Language-Team: khiav&yrbn <http://khiav.99k.org/>\n"
@@ -536,9 +540,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 "新增..."
@@ -605,8 +615,13 @@ msgstr "所有 GC/Wii 映像檔 (gcm, iso, ciso, gcz)"
msgid "All Gamecube GCM files (gcm)"
msgstr "所有 Gamecube 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##)"
@@ -687,7 +702,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 "畫面比例："
@@ -708,7 +727,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 "自動"
@@ -820,7 +843,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 "下方"
@@ -853,7 +880,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"
@@ -1084,7 +1115,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 "關閉"
@@ -1194,7 +1229,11 @@ msgstr "連接 Wiimote 3"
msgid "Connect Wiimote 4"
msgstr "連接 Wiimote 4"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/Main.cpp:597
=======
#: Source/Core/DolphinWX/Src/Main.cpp:598
>>>>>>> Update translation files for recent changes in the code.
msgid "Connecting..."
msgstr "正在連接..."
@@ -1379,7 +1418,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 模擬器 (快)"
@@ -1599,7 +1642,11 @@ msgstr "顯示控制器輸入狀態 (僅作用於錄製或播放影片時)。"
msgid "Divide"
msgstr "Divide"
<<<<<<< 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 "您要停止目前的模擬嗎？"
@@ -1629,12 +1676,21 @@ msgstr "Dolphin 模擬 Wiimote 設定"
msgid "Dolphin FIFO"
msgstr "Dolphin"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1220
msgid "Dolphin GCPad Configuration"
msgstr "Dolphin 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 "Dolphin 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 "Dolphin TAS 影片 (*.dtm)"
@@ -1718,9 +1774,15 @@ msgid ""
"If unsure, leave this unchecked."
msgstr ""
<<<<<<< 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 "Dutch"
@@ -1846,16 +1908,23 @@ 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
#, fuzzy
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 "開啟作弊"
@@ -1987,9 +2056,15 @@ msgstr ""
msgid "End"
msgstr "End"
<<<<<<< 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 "English"
@@ -2018,6 +2093,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 "錯誤"
@@ -2029,6 +2105,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 "讀取選擇的語系出錯。返回使用系統預設值。"
@@ -2481,9 +2563,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 "French"
@@ -2551,7 +2639,11 @@ msgid "Gamecube &Pad Settings"
msgstr "Gamecube 控制器設定(&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 "Gamecube 記憶卡 (*.raw,*.gcp)"
@@ -2574,8 +2666,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 "一般"
@@ -2585,9 +2681,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 "German"
@@ -2709,8 +2811,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 "快捷鍵"
@@ -2912,7 +3018,11 @@ msgid ""
"InstallExceptionHandler called, but this platform does not yet support it."
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 至 Wii 選單..."
@@ -2996,9 +3106,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 "Italian"
@@ -3157,12 +3273,20 @@ msgstr "讀取儲存格 8"
msgid "Load State..."
msgstr "讀取進度檔..."
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1418
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
>>>>>>> Update translation files for recent changes in the code.
#, fuzzy
msgid "Load Wii System Menu"
msgstr "讀取 Wii 系統選單 (%d%c)"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1413
=======
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
>>>>>>> Update translation files for recent changes in the code.
#, c-format
msgid "Load Wii System Menu %d%c"
msgstr "讀取 Wii 系統選單 (%d%c)"
@@ -3243,7 +3367,11 @@ msgstr "MMU 速度修正"
msgid "MadCatz Gameshark files(*.gcs)"
msgstr "MadCatz Gameshark 檔案(*.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 "主搖桿"
@@ -3275,7 +3403,11 @@ msgid "Memory Byte"
msgstr "記憶卡(&M)"
#: 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 "記憶卡"
@@ -3459,7 +3591,11 @@ msgstr "NP Tab"
msgid "NP Up"
msgstr "NP Up"
<<<<<<< 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:"
@@ -3547,7 +3683,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 "未連接"
@@ -3608,7 +3748,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 "開啟"
@@ -3737,8 +3880,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 "暫停"
@@ -3759,8 +3907,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 "執行"
@@ -3787,7 +3940,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 "請確認..."
@@ -4001,10 +4158,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 "移除"
@@ -4023,7 +4187,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 "重置"
@@ -4066,7 +4233,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 "取樣率："
@@ -4151,7 +4322,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.
#, fuzzy, c-format
msgid "Scanning %s"
msgstr "正在掃瞄..."
@@ -4191,12 +4366,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"
@@ -4222,6 +4406,7 @@ msgstr "選擇浮動視窗"
msgid "Select the file to load"
msgstr "選擇要讀取的檔案"
<<<<<<< HEAD
#: Source/Core/DolphinWX/Src/FrameTools.cpp:1324
msgid "Select the save file"
msgstr "選擇存檔"
@@ -4231,6 +4416,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 "選擇要儲存的進度"
@@ -4578,9 +4774,15 @@ msgstr "聲音緩衝建立失敗：%s"
msgid "Space"
msgstr "Space"
<<<<<<< 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 "Spanish"
@@ -4616,7 +4818,11 @@ msgstr "Square Stick"
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"
@@ -4651,7 +4857,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 "停止"
@@ -4724,7 +4933,10 @@ msgstr "Table 右"
#: 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 "截取畫面"
@@ -4950,12 +5162,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 "上方"
@@ -5059,6 +5278,18 @@ msgstr "接收到帶有未知 id 的錯誤訊息：%d"
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"
@@ -5269,7 +5500,11 @@ msgstr "DVD 根："
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"
@@ -5300,7 +5535,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 "Wiimote 已連接"
@@ -5333,9 +5572,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 "執行中..."