diff --git a/desmume/configure.ac b/desmume/configure.ac
index a4f2b307f..21b3d2f13 100644
--- a/desmume/configure.ac
+++ b/desmume/configure.ac
@@ -247,7 +247,7 @@ if test "x$HAVE_SDL" = "xyes"; then
       GETTEXT_PACKAGE=desmume
       AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the gettext package name])
       AC_SUBST(GETTEXT_PACKAGE)
-      ALL_LINGUAS="fr nb pt_BR sv zh_CN"
+      ALL_LINGUAS="fr nb pt_BR sv zh_CN zh_TW"
       AM_GLIB_GNU_GETTEXT
       PO_DIR="po"
       PO_MAKEFILE="po/Makefile.in"
diff --git a/desmume/po/LINGUAS b/desmume/po/LINGUAS
index c6c4c424a..73d65fc5b 100644
--- a/desmume/po/LINGUAS
+++ b/desmume/po/LINGUAS
@@ -3,3 +3,4 @@ nb
 pt_BR
 sv
 zh_CN
+zh_TW
diff --git a/desmume/po/zh_TW.po b/desmume/po/zh_TW.po
new file mode 100644
index 000000000..fd4d69253
--- /dev/null
+++ b/desmume/po/zh_TW.po
@@ -0,0 +1,593 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: desmume\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-07-17 01:38-0400\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Ronmi Ren <ronmi@rmi.twbbs.org>\n"
+"Language-Team: DeSmuME Team <desmume-devel@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Chinese\n"
+"X-Poedit-Country: TAIWAN\n"
+"X-Poedit-SourceCharset: iso-8859-1\n"
+
+#. Creating the selection window
+#: ../src/gtk-glade/callbacks.c:91
+msgid "Open..."
+msgstr "開啟..."
+
+#: ../src/gtk-glade/callbacks.c:100
+msgid "Nds binary (.nds)"
+msgstr "NDS遊戲 (.nds)"
+
+#: ../src/gtk-glade/callbacks.c:101
+msgid "Nds binary with loader (.ds.gba)"
+msgstr "NDS遊戲與載入器 (.ds.gba)"
+
+#: ../src/gtk-glade/callbacks.c:102
+msgid "All files"
+msgstr "所有檔案"
+
+#: ../src/gtk-glade/callbacks.c:117
+#: ../src/gtk-glade/main.c:532
+#, c-format
+msgid ""
+"Unable to load :\n"
+"%s"
+msgstr ""
+"載入失敗:\n"
+"%s"
+
+#: ../src/gtk-glade/callbacks.c:291
+msgid "You don't have any joystick!"
+msgstr "沒有偵測到搖桿"
+
+#: ../src/gtk-glade/callbacks.c:293
+msgid "Can't configure joystick while the game is running!"
+msgstr "在遊戲執行時不可以調整搖桿設定"
+
+#: ../src/gtk-glade/gdk_3Demu.c:64
+#, c-format
+msgid "*** Cannot get %s attribute value\n"
+msgstr "*** 無法取得屬性 %s 的值\n"
+
+#: ../src/gtk-glade/gdk_3Demu.c:158
+msgid "*** Failed to create pixmap.\n"
+msgstr "*** 創造點陣圖失敗\n"
+
+#: ../src/gtk-glade/gdk_3Demu.c:168
+msgid "*** No appropriate OpenGL-capable visual found.\n"
+msgstr "*** 找不到與 OpenGL 相容的可用視覺效果\n"
+
+#: ../src/gtk-glade/gdk_3Demu.c:181
+msgid "Failed to create the GdkGLPixmap\n"
+msgstr "創造 GdkGLPixmap 失敗\n"
+
+#: ../src/gtk-glade/gdk_3Demu.c:191
+msgid "Connot create the OpenGL rendering context\n"
+msgstr "創造 OpenGL rendering context 失敗\n"
+
+#: ../src/gtk-glade/glade-xml.c:113
+#, c-format
+msgid "could not find signal handler '%s'.\n"
+msgstr "找不到 signal handler\n"
+
+#: ../src/gtk-glade/main.c:106
+#, c-format
+msgid "USAGE: %s [OPTIONS] [nds-file]\n"
+msgstr "使用方式: %s [選項] [nds檔]\n"
+
+#: ../src/gtk-glade/main.c:107
+msgid "OPTIONS:\n"
+msgstr "可用選項:\n"
+
+#: ../src/gtk-glade/main.c:109
+msgid ""
+"   --soft-convert      Use software colour conversion during OpenGL\n"
+"                       screen rendering. May produce better or worse\n"
+"                       frame rates depending on hardware.\n"
+"   \n"
+"   --disable-3d        Disables the 3D emulation\n"
+"\n"
+msgstr ""
+"   --soft-convert      在 OpenGL 模式中使用軟體轉換色彩。\n"
+"                       不同的硬體，效能可能更好也可能更壞。\n"
+"   \n"
+"   --disable-3d        關閉 3D 模擬\n"
+"\n"
+
+#: ../src/gtk-glade/main.c:116
+msgid ""
+"   --disable-limiter   Disables the 60 fps limiter\n"
+"   \n"
+"   --fwlang=LANG       Set the language in the firmware, LANG as follows:\n"
+"                         0 = Japanese\n"
+"                         1 = English\n"
+"                         2 = French\n"
+"                         3 = German\n"
+"                         4 = Italian\n"
+"                         5 = Spanish\n"
+"\n"
+"   --arm9gdb=PORT_NUM  Enable the ARM9 GDB stub on the given port\n"
+"   --arm7gdb=PORT_NUM  Enable the ARM7 GDB stub on the given port\n"
+"   \n"
+"   --help              Display this message\n"
+msgstr ""
+"   --disable-limiter   取消 fps 60 的上限\n"
+"   \n"
+"   --fwlang=LANG       設定韌體的語言, 可用的 LANG 設定有:\n"
+"                         0 = 日文\n"
+"                         1 = 英文\n"
+"                         2 = 法文\n"
+"                         3 = 德文\n"
+"                         4 = 義大利文\n"
+"                         5 = 西班牙文\n"
+"\n"
+"   --arm9gdb=PORT_NUM  Enable the ARM9 GDB stub on the given port\n"
+"   --arm7gdb=PORT_NUM  Enable the ARM7 GDB stub on the given port\n"
+"   \n"
+"   --help              顯示這個幫助訊息\n"
+
+#: ../src/gtk-glade/main.c:149
+msgid "Firmware language must be set to a value from 0 to 5.\n"
+msgstr "韌體語言必須設定 0 到 5 之間的值\n"
+
+#: ../src/gtk-glade/main.c:161
+msgid "ARM9 GDB stub port must be in the range 1 to 65535\n"
+msgstr ""
+
+#: ../src/gtk-glade/main.c:173
+msgid "ARM7 GDB stub port must be in the range 1 to 65535\n"
+msgstr ""
+
+#: ../src/gtk-glade/main.c:185
+#, c-format
+msgid "NDS file (\"%s\") already set\n"
+msgstr "NDS檔 (\"%s\") 已經設定\n"
+
+#: ../src/gtk-glade/main.c:198
+#, c-format
+msgid "USAGE: %s [options] [nds-file]\n"
+msgstr "使用方式: %s [選項] [nds檔]\n"
+
+#: ../src/gtk-glade/main.c:199
+#, c-format
+msgid "USAGE: %s --help    - for help\n"
+msgstr "使用方式: %s --help   - 顯示幫助訊息\n"
+
+#: ../src/gtk-glade/main.c:332
+#, c-format
+msgid "State %d (empty)"
+msgstr "存檔 %d (空的)"
+
+#: ../src/gtk-glade/main.c:459
+#, c-format
+msgid "Failed to create ARM9 gdbstub on port %d\n"
+msgstr ""
+
+#: ../src/gtk-glade/main.c:470
+#, c-format
+msgid "Failed to create ARM7 gdbstub on port %d\n"
+msgstr ""
+
+#: ../src/gtk-glade/main.c:479
+#, c-format
+msgid "Error trying to initialize SDL: %s\n"
+msgstr "SDL 初始化錯誤: %s\n"
+
+#: ../src/gtk-glade/main.c:551
+#, c-format
+msgid "Failed to initialise openGL 3D emulation; removing 3D support\n"
+msgstr "無法初始化 OpenGL 3D 模擬。取消 3D 支援\n"
+
+#: ../src/gtk-glade/main.c:557
+#, c-format
+msgid "Failed to setup openGL 3D emulation; removing 3D support\n"
+msgstr "無法設定 OpenGL 3D 模擬。取消 3D 支援\n"
+
+#: ../src/gtk-glade/main.c:584
+#, c-format
+msgid "Error trying to start FPS limiter timer: %s\n"
+msgstr "無法啟始 fps 限制的計時器: %s\n"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:1
+msgid "0"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:2
+msgid "1"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:3
+msgid "1x"
+msgstr "原始大小"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:4
+msgid "2"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:5
+msgid "2x"
+msgstr "2倍"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:6
+msgid "3"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:7
+msgid "3D operation detected"
+msgstr "偵測到 3D 操作"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:8
+msgid "3D rom"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:9
+msgid "3x"
+msgstr "3倍"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:10
+msgid "4"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:11
+msgid "5"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:12
+msgid "6"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:13
+msgid "7"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:14
+msgid "8"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:15
+msgid "9"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:16
+msgid "?"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:17
+msgid "A : "
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:18
+msgid "Audio On"
+msgstr "開啟音效"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:19
+msgid "Axis :"
+msgstr "方向軸 :"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:20
+msgid "B : "
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:21
+msgid "BG0"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:22
+msgid "BG1"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:23
+msgid "BG2"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:24
+msgid "BG3"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:25
+msgid "Boost : "
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:26
+msgid "Config"
+msgstr "設定"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:27
+msgid "DeSmuME"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:28
+msgid "DeSmuMe"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:29
+msgid "Debug : "
+msgstr "除錯 :"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:30
+msgid "Down : "
+msgstr "下 :"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:31
+msgid "FrameSkip"
+msgstr "畫面跳過"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:32
+msgid "IO regs"
+msgstr "IO 暫存器"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:33
+msgid "Joystick Config"
+msgstr "搖桿設定"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:34
+msgid "Joystick controls"
+msgstr "搖桿控制"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:35
+msgid "Key definition"
+msgstr "按鍵定義"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:36
+msgid "Keyboard Config"
+msgstr "鍵盤設定"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:37
+msgid "Keyboard controls"
+msgstr "鍵盤控制"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:38
+msgid "L : "
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:39
+msgid "Layers"
+msgstr "圖層"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:40
+msgid "Left : "
+msgstr "左 :"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:41
+msgid "Load State"
+msgstr "讀取即時存檔"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:42
+msgid "Nintendo DS emulator based on work by Yopyop"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:43
+msgid "OBJ"
+msgstr "物件"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:44
+msgid "Press a button..."
+msgstr "請按一個按鈕..."
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:45
+msgid "Press a key..."
+msgstr "請按一個按鍵..."
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:46
+msgid "R : "
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:47
+msgid "Reset"
+msgstr "重新啟動"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:48
+msgid "Right : "
+msgstr "右 :"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:49
+msgid "Right Screen"
+msgstr "視窗水平排列"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:50
+msgid "Rotate Screen 0"
+msgstr "螢幕旋轉 0 度"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:51
+msgid "Rotate Screen 180"
+msgstr "螢幕旋轉 180 度"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:52
+msgid "Rotate Screen 270"
+msgstr "螢幕旋轉 270 度"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:53
+msgid "Rotate Screen 90"
+msgstr "螢幕旋轉 90 度"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:54
+msgid "Save State"
+msgstr "即時存檔"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:55
+msgid "Select : "
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:56
+msgid "Size"
+msgstr "大小"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:57
+msgid "Start : "
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:58
+msgid "State 1"
+msgstr "存檔 1"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:59
+msgid "State 10"
+msgstr "存檔 10"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:60
+msgid "State 2"
+msgstr "存檔 2"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:61
+msgid "State 3"
+msgstr "存檔 3"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:62
+msgid "State 4"
+msgstr "存檔 4"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:63
+msgid "State 5"
+msgstr "存檔 5"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:64
+msgid "State 6"
+msgstr "存檔 6"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:65
+msgid "State 7"
+msgstr "存檔 7"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:66
+msgid "State 8"
+msgstr "存檔 8"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:67
+msgid "State 9"
+msgstr "存檔 9"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:68
+msgid "TYPE: Auto (1B)"
+msgstr "TYPE: 自動選擇 (1B)"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:69
+msgid "TYPE: EEPROM1 (4kB)"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:70
+msgid "TYPE: EEPROM2 (512kB)"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:71
+msgid "TYPE: EEPROM2 (64kB)"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:72
+msgid "TYPE: FLASH (256kB)"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:73
+msgid "TYPE: FRAM (2MB)"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:74
+msgid "Tools"
+msgstr "工具"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:75
+msgid "True Gap"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:76
+msgid "Up : "
+msgstr "上 :"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:77
+msgid "View Memory"
+msgstr "檢視記憶體"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:78
+msgid "View Palette"
+msgstr "檢視調色盤"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:79
+msgid "View Tiles"
+msgstr "檢視物件"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:80
+msgid "X : "
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:81
+msgid "Y : "
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:82
+msgid "_Emulation"
+msgstr "模擬器 (_E)"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:83
+msgid "_File"
+msgstr "檔案 (_F)"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:84
+msgid "_PrintScreen"
+msgstr "截圖 (_P)"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:85
+msgid "_Saves"
+msgstr "存檔 (_S)"
+
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:86
+msgid "http://desmume.sf.net"
+msgstr ""
+
+#. TRANSLATORS: Replace this string with your names, one name per line.
+#: ../src/gtk-glade/glade/DeSmuMe.glade.h:88
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe_Dtools.glade.h:1
+msgid "      GoTo: "
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe_Dtools.glade.h:2
+msgid "  Palette : "
+msgstr "調色盤:"
+
+#: ../src/gtk-glade/glade/DeSmuMe_Dtools.glade.h:3
+msgid "16 bit"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe_Dtools.glade.h:4
+msgid "16c"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe_Dtools.glade.h:5
+msgid "256c"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe_Dtools.glade.h:6
+msgid "32 bit"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe_Dtools.glade.h:7
+msgid "8 bit"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe_Dtools.glade.h:8
+msgid ""
+"ARM9 cpu\n"
+"ARM7 cpu"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe_Dtools.glade.h:10
+msgid "BMP"
+msgstr ""
+
+#: ../src/gtk-glade/glade/DeSmuMe_Dtools.glade.h:11
+msgid "Go!"
+msgstr "執行"
+
+#: ../src/gtk-glade/glade/DeSmuMe_Dtools.glade.h:12
+msgid ""
+"cpu : ARM9\n"
+"cpu : ARM7"
+msgstr ""
+
+
+