diff --git a/umap/locale/zh_TW/LC_MESSAGES/django.mo b/umap/locale/zh_TW/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..7661d7e9
Binary files /dev/null and b/umap/locale/zh_TW/LC_MESSAGES/django.mo differ
diff --git a/umap/locale/zh_TW/LC_MESSAGES/django.po b/umap/locale/zh_TW/LC_MESSAGES/django.po
new file mode 100644
index 00000000..cce25466
--- /dev/null
+++ b/umap/locale/zh_TW/LC_MESSAGES/django.po
@@ -0,0 +1,150 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Hsin-lin Cheng <lancetw@gmail.com>, 2014
+# Yuan CHAO <yuanchao@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: uMap\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-01 01:29+0100\n"
+"PO-Revision-Date: 2014-08-21 17:10+0000\n"
+"Last-Translator: Yuan CHAO <yuanchao@gmail.com>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/umap/language/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: views.py:154 templates/leaflet_storage/map_list.html:7
+msgid "by"
+msgstr "由"
+
+#: views.py:158
+msgid "View the map"
+msgstr "檢視地圖"
+
+#: templates/base.html:39
+msgid "Type editors nick to add…"
+msgstr "鍵入編輯者的暱稱以加入..."
+
+#: templates/auth/user_detail.html:7
+#, python-format
+msgid "Browse %(current_user)s's maps"
+msgstr "瀏覽 %(current_user)s 的地圖"
+
+#: templates/leaflet_storage/map_list.html:11
+msgid "More"
+msgstr "詳細"
+
+#: templates/leaflet_storage/map_update_settings.html:2
+msgid "Map settings"
+msgstr "地圖設定"
+
+#: templates/registration/login.html:3
+msgid "Please choose a provider"
+msgstr "選擇服務商"
+
+#: templates/umap/about_summary.html:6
+#, python-format
+msgid ""
+"uMap let you create maps with <a href=\"%(osm_url)s\" />OpenStreetMap</a> "
+"layers in a minute and embed them in your site."
+msgstr "uMap 讓您使用 <a href=\"%(osm_url)s\" />OpenStreetMap</a> 圖層來建立您的地圖﹐只需要幾分鐘就可以完成並嵌入您的網頁。"
+
+#: templates/umap/about_summary.html:11
+msgid "Choose the layers of your map"
+msgstr "選擇您地圖的圖層"
+
+#: templates/umap/about_summary.html:12
+msgid "Add POIs: markers, lines, polygons..."
+msgstr "新增景點 POI：標記、線段、多邊形..."
+
+#: templates/umap/about_summary.html:13
+msgid "Manage POIs colours and icons"
+msgstr "管理景點 POI 的顏色與圖示"
+
+#: templates/umap/about_summary.html:14
+msgid "Manage map options: display a minimap, locate user on load…"
+msgstr "管理地圖選項：顯示小型地圖﹐設定初始位置..."
+
+#: templates/umap/about_summary.html:15
+msgid "Batch import geostructured data (geojson, gpx, kml, osm...)"
+msgstr "批次匯入地理資訊 (geojson, gpx, kml, osm... )"
+
+#: templates/umap/about_summary.html:16
+msgid "Choose the license for your data"
+msgstr "選擇您的資料的授權條例"
+
+#: templates/umap/about_summary.html:17
+msgid "Embed and share your map"
+msgstr "內嵌並分享您的地圖"
+
+#: templates/umap/about_summary.html:23
+#, python-format
+msgid "And it's <a href=\"%(repo_url)s\">open source</a>!"
+msgstr "而且 <a href=\"%(repo_url)s\">開放原始碼</a>！"
+
+#: templates/umap/about_summary.html:32 templates/umap/navigation.html:28
+msgid "Create a map"
+msgstr "建立地圖"
+
+#: templates/umap/about_summary.html:34
+msgid "Play with the demo"
+msgstr "播放展示"
+
+#: templates/umap/home.html:10
+#, python-format
+msgid ""
+"This is a demo instance, used for tests and pre-rolling releases. If you "
+"need a stable instance, please use <a "
+"href=\"%(stable_url)s\">%(stable_url)s</a>. You can also host your own "
+"instance, it's <a href=\"%(repo_url)s\">open source</a>!"
+msgstr "這是一個範例服務﹐提供測試與正式版發行前驗證使用。如果您需要一個穩定的服務，請使用 <a href=\"%(stable_url)s\">%(stable_url)s</a>。您也可以自行架設服務﹐這完全是 <a href=\"%(repo_url)s\">開放原始碼</a> 的！"
+
+#: templates/umap/home.html:17
+msgid "Map of the uMaps"
+msgstr "uMaps 地圖"
+
+#: templates/umap/home.html:24
+msgid "Get inspired, browse maps"
+msgstr "瀏覽其他地圖"
+
+#: templates/umap/navigation.html:12
+msgid "My maps"
+msgstr "我的地圖"
+
+#: templates/umap/navigation.html:14
+msgid "Log in"
+msgstr "登入"
+
+#: templates/umap/navigation.html:14
+msgid "Sign in"
+msgstr "登錄"
+
+#: templates/umap/navigation.html:16
+msgid "About"
+msgstr "關於"
+
+#: templates/umap/navigation.html:17
+msgid "Feedback"
+msgstr "回報問題"
+
+#: templates/umap/navigation.html:19
+msgid "Log out"
+msgstr "登出"
+
+#: templates/umap/search.html:13
+msgid "Not map found."
+msgstr "找不到地圖。"
+
+#: templates/umap/search_bar.html:6
+msgid "Search maps"
+msgstr "搜尋地圖"
+
+#: templates/umap/search_bar.html:9
+msgid "Search"
+msgstr "搜尋"
diff --git a/umap/settings/base.py b/umap/settings/base.py
index b999f8eb..7498a940 100644
--- a/umap/settings/base.py
+++ b/umap/settings/base.py
@@ -35,6 +35,7 @@ LANGUAGES = (
     ('cs-cz', u'Czech'),
     ('ca', u'Catalan'),
     ('zh', u'Chinese'),
+    ('zh-tw', u'Chinese'),
     ('ru', u'Russian'),
     ('bg', u'Bulgarian'),
     ('vi', u'Vietnamese'),