diff --git a/.tx/config b/.tx/config
index 51ddb1eb43173423f0f0140487fe9e1bcff32e54..c9eb5d1d9f29695d114b9a98c1c0739c264e421d 100644
--- a/.tx/config
+++ b/.tx/config
@@ -207,6 +207,7 @@ trans.tr_TR = apps/susidns/locale/messages_tr.po
 trans.uk_UA = apps/susidns/locale/messages_uk.po
 trans.vi = apps/susidns/locale/messages_vi.po
 trans.zh_CN = apps/susidns/locale/messages_zh.po
+trans.zh_TW = apps/susidns/locale/messages_zh_TW.po
 
 [I2P.desktopgui]
 source_file = apps/desktopgui/locale/messages_en.po
@@ -274,6 +275,7 @@ trans.tr_TR = apps/susimail/locale/messages_tr.po
 trans.uk_UA = apps/susimail/locale/messages_uk.po
 trans.vi = apps/susimail/locale/messages_vi.po
 trans.zh_CN = apps/susimail/locale/messages_zh.po
+trans.zh_TW = apps/susimail/locale/messages_zh_TW.po
 
 [I2P.debconf]
 source_file = debian/po/templates.pot
@@ -301,6 +303,7 @@ trans.sv_SE = debian/po/sv.po
 trans.tr_TR = debian/po/tr.po
 trans.uk_UA = debian/po/uk.po
 trans.zh_CN = debian/po/zh.po
+trans.zh_TW = debian/po/zh_TW.po
 
 [I2P.i2prouter-script]
 source_file = installer/resources/locale/po/messages_en.po
diff --git a/apps/susidns/locale/messages_zh_TW.po b/apps/susidns/locale/messages_zh_TW.po
new file mode 100644
index 0000000000000000000000000000000000000000..d4f2697bcc431c367719eb73360b2654391f998a
--- /dev/null
+++ b/apps/susidns/locale/messages_zh_TW.po
@@ -0,0 +1,727 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the susidns package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+# 男孩不壞, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-25 12:28+0000\n"
+"PO-Revision-Date: 2016-05-25 12:34+0000\n"
+"Last-Translator: zzzi2p\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/I2P/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"
+
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:131
+#, java-format
+msgid "Host name \"{0}\" contains illegal character {1}"
+msgstr "主機名\"{0}\"包含了無效字元{1}"
+
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:144
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:146
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:153
+#, java-format
+msgid "Host name cannot start with \"{0}\""
+msgstr "主機名不能以\"{0}\"起頭"
+
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:148
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:150
+#, java-format
+msgid "Host name cannot end with \"{0}\""
+msgstr "主機名不能以\"{0}\"結尾"
+
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:155
+#, java-format
+msgid "Host name cannot contain \"{0}\""
+msgstr "主機名不能以包含\"{0}\""
+
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:158
+#, java-format
+msgid ""
+"Host name \"{0}\" requires conversion to ASCII but the conversion library is"
+" unavailable in this JVM"
+msgstr "主機名\"{0}\" 必須轉換成ASCII，但轉換庫在此JVM不可用"
+
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:223
+msgid "None"
+msgstr "ç„¡"
+
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:231
+msgid "Hashcash"
+msgstr "哈希款"
+
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:233
+msgid "Hidden"
+msgstr "隱身"
+
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:235
+msgid "Signed"
+msgstr "已簽屬"
+
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:237
+msgid "Key"
+msgstr "金鑰"
+
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:239
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:264
+#, java-format
+msgid "Type {0}"
+msgstr "é¡žåž‹ {0}"
+
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:251
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:258
+#: ../src/java/src/i2p/susi/dns/AddressBean.java:261
+msgid "DSA 1024 bit"
+msgstr "1024位 數位簽章演算"
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:188
+#, java-format
+msgid "One result for search within filtered list."
+msgid_plural "{0} results for search within filtered list."
+msgstr[0] "{0} 在過濾列表中的搜尋結果。"
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:192
+#, java-format
+msgid "Filtered list contains 1 entry."
+msgid_plural "Filtered list contains {0} entries."
+msgstr[0] "過濾列表包含了{0}條目。"
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:197
+#, java-format
+msgid "One result for search."
+msgid_plural "{0} results for search."
+msgstr[0] "{0} 項搜尋結果。"
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:206
+#, java-format
+msgid "Address book contains 1 entry."
+msgid_plural "Address book contains {0} entries."
+msgstr[0] "地址簿包含{0}條目。"
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:222
+#, java-format
+msgid "Showing {0} of {1}"
+msgstr "顯示 {1}的 {0} "
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:244
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:234
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:453
+msgid "Add"
+msgstr "新增"
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:244
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:255
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:234
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:246
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:451
+msgid "Replace"
+msgstr "取代"
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:254
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:245
+#, java-format
+msgid "Host name {0} is already in address book, unchanged."
+msgstr "主機名 {0} 已存在於地址簿，未變更。"
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:256
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:247
+#, java-format
+msgid ""
+"Host name {0} is already in address book with a different destination. Click"
+" \"Replace\" to overwrite."
+msgstr "不同目的地的主機名 {0} 已存在於地址簿。點擊『取代』以覆寫。"
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:269
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:260
+#, java-format
+msgid "Destination added for {0}."
+msgstr "目的地已加入 {0}。"
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:271
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:262
+#, java-format
+msgid "Destination changed for {0}."
+msgstr "目的地已變為 {0}。"
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:273
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:264
+msgid "Warning - host name does not end with \".i2p\""
+msgstr "警告 - 主機名並未以『i2p』結尾。"
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:278
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:272
+msgid "Invalid Base 64 destination."
+msgstr "無效的Base 64目的地。"
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:284
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:278
+#, java-format
+msgid "Invalid host name \"{0}\"."
+msgstr "無效的主機名『{0}』。"
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:287
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:281
+msgid "Please enter a host name and destination"
+msgstr "請輸入主機名和目的地"
+
+#. clear search when deleting
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:291
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:312
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:285
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:310
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:285
+msgid "Delete Entry"
+msgstr "刪除輸入"
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:291
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:285
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:369
+msgid "Delete Selected"
+msgstr "刪除所選"
+
+#. parameter is a host name
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:305
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:302
+#, java-format
+msgid "Destination {0} deleted."
+msgstr ""
+
+#. parameter will always be >= 2
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:308
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:305
+#, java-format
+msgid "1 destination deleted."
+msgid_plural "{0} destinations deleted."
+msgstr[0] ""
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:310
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:307
+msgid "No entries selected to delete."
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:318
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:314
+msgid "Address book saved."
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:321
+msgid "ERROR: Could not write addressbook file."
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:326
+#: ../src/java/src/i2p/susi/dns/ConfigBean.java:108
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:318
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:157
+msgid ""
+"Invalid form submission, probably because you used the \"back\" or "
+"\"reload\" button on your browser. Please resubmit."
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/AddressbookBean.java:328
+#: ../src/java/src/i2p/susi/dns/ConfigBean.java:110
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:320
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:159
+msgid ""
+"If the problem persists, verify that you have cookies enabled in your "
+"browser."
+msgstr "如果問題持續出現，請檢查您的瀏覽器是否已啟用cookie。"
+
+#: ../src/java/src/i2p/susi/dns/ConfigBean.java:99
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:131
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:161
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:152
+msgid "Save"
+msgstr "儲存"
+
+#: ../src/java/src/i2p/susi/dns/ConfigBean.java:101
+msgid "Configuration saved."
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/ConfigBean.java:102
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:151
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:159
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:150
+msgid "Reload"
+msgstr "重新載入"
+
+#: ../src/java/src/i2p/susi/dns/ConfigBean.java:104
+msgid "Configuration reloaded."
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:106
+#, java-format
+msgid "{0} address book in {1} database"
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:255
+msgid "Manually added via SusiDNS"
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:269
+#, java-format
+msgid "Failed to add Destination for {0} to naming service {1}"
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/NamingServiceBean.java:293
+#, java-format
+msgid "Failed to delete Destination for {0} from naming service {1}"
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:144
+msgid ""
+"Subscriptions saved, updating addressbook from subscription sources now."
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:149
+msgid "Subscriptions saved."
+msgstr ""
+
+#: ../src/java/src/i2p/susi/dns/SubscriptionsBean.java:153
+msgid "Subscriptions reloaded."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:135
+msgid "address book"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:141
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:157
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:133
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:149
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:125
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:141
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:136
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:124
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:140
+msgid "Overview"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:143
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:135
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:127
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:122
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:126
+msgid "Address books"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:145
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:137
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:129
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:124
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:128
+msgid "private"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:147
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:139
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:131
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:126
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:130
+msgid "master"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:149
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:141
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:133
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:128
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:132
+msgid "router"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:151
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:143
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:135
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:130
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:134
+msgid "published"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:153
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:145
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:137
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:132
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:136
+msgid "Subscriptions"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:155
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:147
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:139
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:134
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:138
+msgid "Configuration"
+msgstr "設定"
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:159
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:143
+msgid "Address book"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:164
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:148
+msgid "Storage"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:184
+msgid "Filter"
+msgstr "過濾器"
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:187
+msgid "other"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:189
+msgid "all"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:201
+msgid "Current filter"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:206
+msgid "clear filter"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:219
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:223
+msgid "Search"
+msgstr "搜尋"
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:262
+msgid "Name"
+msgstr "名稱"
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:264
+msgid "Links"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:266
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:445
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:277
+msgid "Destination"
+msgstr "目標"
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:302
+msgid "Mark for deletion"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:321
+msgid "Base 32 address"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:325
+msgid "More information on this entry"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:328
+msgid "details"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:367
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:449
+msgid "Cancel"
+msgstr "取消"
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:396
+msgid "Export in hosts.txt format"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:424
+msgid "This address book is empty."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:439
+msgid "Add new destination"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/addressbook_jsp.java:441
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:177
+msgid "Host Name"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:127
+msgid "configuration"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:163
+msgid "Hints"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:165
+msgid ""
+"File and directory paths here are relative to the addressbook's working "
+"directory, which is normally ~/.i2p/addressbook/ (Linux) or "
+"%APPDATA%\\I2P\\addressbook\\ (Windows)."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:167
+msgid ""
+"If you want to manually add lines to an addressbook, add them to the private"
+" or master addressbooks."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:169
+msgid ""
+"The router addressbook and the published addressbook are updated by the "
+"addressbook application."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:171
+msgid ""
+"When you publish your addressbook, ALL destinations from the master and "
+"router addressbooks appear there."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:173
+msgid ""
+"Use the private addressbook for private destinations, these are not "
+"published."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:175
+msgid "Options"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:177
+msgid "File containing the list of subscriptions URLs (no need to change)"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:179
+msgid "Update interval in hours"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:181
+msgid ""
+"Your public hosts.txt file (choose a path within your webserver document "
+"root)"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:183
+msgid "Your hosts.txt (don't change)"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:185
+msgid "Your personal addressbook, these hosts will be published"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:187
+msgid "Your private addressbook, it is never published"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:189
+msgid "Port for your eepProxy (no need to change)"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:191
+msgid "Hostname for your eepProxy (no need to change)"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:193
+msgid "Whether to update the published addressbook"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:195
+msgid ""
+"File containing the etags header from the fetched subscription URLs (no need"
+" to change)"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:197
+msgid ""
+"File containing the modification timestamp for each fetched subscription URL"
+" (no need to change)"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:199
+msgid "File to log activity to (change to /dev/null if you like)"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/config_jsp.java:201
+msgid "Name of the theme to use (defaults to 'light')"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:119
+msgid "addressbook"
+msgstr "地址簿"
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:191
+msgid "Encoded Name"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:205
+msgid "Base 32 Address"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:213
+msgid "Base 64 Hash"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:219
+msgid "Address Helper"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:225
+msgid "link"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:229
+msgid "Public Key"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:231
+msgid "ElGamal 2048 bit"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:235
+msgid "Signing Key"
+msgstr "簽名金鑰"
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:241
+msgid "Certificate"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:247
+msgid "Added Date"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:253
+msgid "Validated"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:255
+msgid "no"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:255
+msgid "yes"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:259
+msgid "Source"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:265
+msgid "Last Modified"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/details_jsp.java:271
+msgid "Notes"
+msgstr "注意"
+
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:116
+msgid "Introduction"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:138
+msgid "What is the addressbook?"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:140
+msgid "The addressbook application is part of your I2P installation."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:142
+msgid ""
+"It regularly updates your hosts.txt file from distributed sources or "
+"\"subscriptions\"."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:144
+#, java-format
+msgid ""
+"In the default configuration, the address book is only subscribed to {0}."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:146
+msgid ""
+"Subscribing to additional sites is easy, just add them to your <a "
+"href=\"subscriptions\">subscriptions</a> file."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:148
+msgid ""
+"For more information on naming in I2P, see <a href=\"http://i2p-"
+"projekt.i2p/naming.html\" target=\"_top\">the overview</a>."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:150
+msgid "How does the addressbook application work?"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:152
+msgid ""
+"The addressbook application regularly polls your subscriptions and merges "
+"their content into your \"router\" address book."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:154
+msgid ""
+"Then it merges your \"master\" address book into the router address book as "
+"well."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:156
+msgid ""
+"If configured, the router address book is now written to the \"published\" "
+"address book, which will be publicly available if you are running an "
+"eepsite."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:158
+msgid ""
+"The router also uses a private address book (not shown in the picture), "
+"which is not merged or published."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:160
+msgid ""
+"Hosts in the private address book can be accessed by you but their addresses"
+" are never distributed to others."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/index_jsp.java:162
+msgid ""
+"The private address book can also be used for aliases of hosts in your other"
+" address books."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:118
+msgid "subscriptions"
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:154
+msgid "The subscription file contains a list of i2p URLs."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:156
+msgid ""
+"The addressbook application regularly checks this list for new eepsites."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:158
+msgid "Those URLs refer to published hosts.txt files."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:160
+#, java-format
+msgid ""
+"The default subscription is the hosts.txt from {0}, which is updated "
+"infrequently."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:162
+msgid ""
+"So it is a good idea to add additional subscriptions to sites that have the "
+"latest addresses."
+msgstr ""
+
+#: ../src/tmp/i2p/susi/dns/jsp/subscriptions_jsp.java:164
+msgid "See the FAQ for a list of subscription URLs."
+msgstr ""
diff --git a/apps/susimail/locale/messages_zh_TW.po b/apps/susimail/locale/messages_zh_TW.po
new file mode 100644
index 0000000000000000000000000000000000000000..8dc83198623305072d3bc564e4469b105675b7b8
--- /dev/null
+++ b/apps/susimail/locale/messages_zh_TW.po
@@ -0,0 +1,533 @@
+# I2P
+# Copyright (C) 2009 The I2P Project
+# This file is distributed under the same license as the susimail package.
+# To contribute translations, see http://www.i2p2.de/newdevelopers
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-10-06 13:52+0000\n"
+"PO-Revision-Date: 2016-10-06 13:59+0000\n"
+"Last-Translator: zzzi2p\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/I2P/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"
+
+#: src/src/i2p/susi/webmail/MailPart.java:207
+#, java-format
+msgid "No encoder found for encoding \\''{0}\\''."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:328
+#: src/src/i2p/susi/webmail/WebMail.java:342
+#: src/src/i2p/susi/webmail/WebMail.java:1014
+msgid "Re:"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:332
+#: src/src/i2p/susi/webmail/WebMail.java:346
+#: src/src/i2p/susi/webmail/WebMail.java:1052
+msgid "Fwd:"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:603
+msgid "unknown"
+msgstr "未知"
+
+#: src/src/i2p/susi/webmail/WebMail.java:624
+msgid "Warning: no charset found, fallback to US-ASCII."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:638
+#, java-format
+msgid "Charset \\''{0}\\'' not supported."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:642
+#, java-format
+msgid "Part ({0}) not shown, because of {1}"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:678
+#: src/src/i2p/susi/webmail/WebMail.java:681
+#, java-format
+msgid "Download attachment {0}"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:682
+msgid "File is packed into a zipfile for security reasons."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:687
+#, java-format
+msgid "Attachment ({0})."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:738
+msgid "Need username for authentication."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:742
+msgid "Need password for authentication."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:746
+msgid "Need hostname for connect."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:751
+msgid "Need port number for pop3 connect."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:758
+msgid "POP3 port number is not in range 0..65535."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:764
+msgid "POP3 port number is invalid."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:770
+msgid "Need port number for smtp connect."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:777
+msgid "SMTP port number is not in range 0..65535."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:783
+msgid "SMTP port number is invalid."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:857
+msgid "User logged out."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:860
+#: src/src/i2p/susi/webmail/WebMail.java:1166
+msgid "Internal error, lost connection."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1017
+#, java-format
+msgid "On {0} {1} wrote:"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1064
+msgid "begin forwarded mail"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1086
+msgid "end forwarded mail"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1093
+#: src/src/i2p/susi/webmail/WebMail.java:2435
+msgid "Could not fetch mail body."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1123
+msgid "Message id not valid."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1161
+msgid "Configuration reloaded"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1228
+#, java-format
+msgid "No Encoding found for {0}"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1232
+#, java-format
+msgid "Could not encode data: {0}"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1237
+#, java-format
+msgid "Error reading uploaded file: {0}"
+msgstr ""
+
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1322
+#: src/src/i2p/susi/webmail/WebMail.java:1325
+msgid "Attachment not found."
+msgstr ""
+
+#. error if we get here
+#: src/src/i2p/susi/webmail/WebMail.java:1352
+#: src/src/i2p/susi/webmail/WebMail.java:1354
+msgid "Message not found."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1399
+#: src/src/i2p/susi/webmail/WebMail.java:1537
+msgid "Invalid pagesize number, resetting to default value."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1423
+msgid "No messages marked for deletion."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1439
+#, java-format
+msgid "1 message deleted."
+msgid_plural "{0} messages deleted."
+msgstr[0] ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1501
+#, java-format
+msgid "Host unchanged. Edit configation file {0} to change host."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1516
+msgid "Configuration saved"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1752
+#: src/src/i2p/susi/webmail/WebMail.java:2225
+msgid "Login"
+msgstr ""
+
+#. mailbox.getNumMails() forces a connection, don't use it
+#. Not only does it slow things down, but a failure causes all our messages to
+#. "vanish"
+#. subtitle = ngettext("1 Message", "{0} Messages",
+#. sessionObject.mailbox.getNumMails());
+#: src/src/i2p/susi/webmail/WebMail.java:1757
+#, java-format
+msgid "1 Message"
+msgid_plural "{0} Messages"
+msgstr[0] ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1763
+msgid "Show Message"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1765
+msgid "New Message"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1767
+msgid "Configuration"
+msgstr "設定"
+
+#: src/src/i2p/susi/webmail/WebMail.java:1778
+msgid "SusiMail"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1791
+msgid "Message has not been sent. Do you want to discard it?"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1864
+#, java-format
+msgid "Error decoding content: {0}"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1973
+msgid "no subject"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1990
+msgid "Found no valid sender address."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:1996
+#, java-format
+msgid "Found no valid address in \\''{0}\\''."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2017
+msgid "No recipients found."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2081
+msgid "Mail sent."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2125
+msgid "Send"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2126
+#: src/src/i2p/susi/webmail/WebMail.java:2341
+#: src/src/i2p/susi/webmail/WebMail.java:2475
+msgid "Cancel"
+msgstr "取消"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2169
+#: src/src/i2p/susi/webmail/WebMail.java:2268
+#: src/src/i2p/susi/webmail/WebMail.java:2423
+msgid "From"
+msgstr "從"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2170
+msgid "To"
+msgstr "至"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2171
+msgid "Cc"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2172
+msgid "Bcc"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2173
+msgid "Bcc to self"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2174
+#: src/src/i2p/susi/webmail/WebMail.java:2269
+#: src/src/i2p/susi/webmail/WebMail.java:2425
+msgid "Subject"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2177
+msgid "Add Attachment"
+msgstr ""
+
+#. TODO disable/hide in JS if no file selected
+#: src/src/i2p/susi/webmail/WebMail.java:2179
+msgid "Add another attachment"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2185
+msgid "Attachments"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2194
+msgid "Delete selected attachments"
+msgstr ""
+
+#. current postman hq length limits 16/12, new postman version 32/32
+#: src/src/i2p/susi/webmail/WebMail.java:2213
+msgid "User"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2214
+msgid "Password"
+msgstr "密碼"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2219
+msgid "Host"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2220
+msgid "POP3 Port"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2221
+msgid "SMTP Port"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2226
+msgid "Read Mail Offline"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2230
+#: src/src/i2p/susi/webmail/WebMail.java:2360
+msgid "Settings"
+msgstr "設定"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2233
+msgid "Learn about I2P mail"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2234
+msgid "Create Account"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2247
+#: src/src/i2p/susi/webmail/WebMail.java:2403
+msgid "New"
+msgstr ""
+
+#. In theory, these are valid and will apply to the first checked message,
+#. but that's not obvious and did it work?
+#. button( REPLY, _t("Reply") ) +
+#. button( REPLYALL, _t("Reply All") ) +
+#. button( FORWARD, _t("Forward") ) + spacer +
+#. button( DELETE, _t("Delete") ) + spacer +
+#: src/src/i2p/susi/webmail/WebMail.java:2254
+msgid "Check Mail"
+msgstr ""
+
+#. if (Config.hasConfigFile())
+#. out.println(button( RELOAD, _t("Reload Config") ) + spacer);
+#: src/src/i2p/susi/webmail/WebMail.java:2257
+msgid "Logout"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2270
+#: src/src/i2p/susi/webmail/WebMail.java:2427
+msgid "Date"
+msgstr "日期"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2273
+msgid "Size"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2314
+msgid "Message is new"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2317
+msgid "Message has an attachment"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2319
+msgid "Message is spam"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2327
+msgid "No messages"
+msgstr ""
+
+#. TODO ngettext
+#: src/src/i2p/susi/webmail/WebMail.java:2339
+msgid "Really delete the marked messages?"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2340
+msgid "Yes, really delete them!"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2343
+msgid "Delete Selected"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2345
+msgid "Mark All"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2347
+msgid "Clear All"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2372
+#: src/src/i2p/susi/webmail/WebMail.java:2373
+msgid "First"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2372
+#: src/src/i2p/susi/webmail/WebMail.java:2373
+#: src/src/i2p/susi/webmail/WebMail.java:2413
+msgid "Previous"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2375
+#, java-format
+msgid "Page {0} of {1}"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2378
+#: src/src/i2p/susi/webmail/WebMail.java:2379
+msgid "Last"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2378
+#: src/src/i2p/susi/webmail/WebMail.java:2379
+#: src/src/i2p/susi/webmail/WebMail.java:2415
+msgid "Next"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2391
+msgid "Really delete this message?"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2391
+msgid "Yes, really delete it!"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2404
+msgid "Reply"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2405
+msgid "Reply All"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2406
+msgid "Forward"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2407
+msgid "Save As"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2409
+#: src/src/i2p/susi/webmail/WebMail.java:2411
+msgid "Delete"
+msgstr "刪除"
+
+#: src/src/i2p/susi/webmail/WebMail.java:2414
+msgid "Back to Folder"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2439
+msgid "Could not fetch mail."
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2457
+msgid "Folder Page Size"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2460
+msgid "Set"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2463
+msgid "Advanced Configuration"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/WebMail.java:2474
+msgid "Save Configuration"
+msgstr ""
+
+#. this appears in the UI so translate
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:102
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:751
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:793
+msgid "No response from server"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:668
+msgid "Error connecting to server"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:673
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:676
+msgid "Error opening mailbox"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/pop3/POP3MailBox.java:1025
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:249
+msgid "Login failed"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:214
+msgid "Cannot connect"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:225
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:237
+msgid "Server refused connection"
+msgstr ""
+
+#. TODO which recipient?
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:262
+msgid "Mail rejected"
+msgstr ""
+
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:276
+#: src/src/i2p/susi/webmail/smtp/SMTPClient.java:279
+msgid "Error sending mail"
+msgstr ""
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
new file mode 100644
index 0000000000000000000000000000000000000000..318e62ea2ef176f57dc225be4148a414d99dda17
--- /dev/null
+++ b/debian/po/zh_TW.po
@@ -0,0 +1,91 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# 男孩不壞, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: I2P\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2015-02-18 22:14+0000\n"
+"PO-Revision-Date: 2016-06-10 12:26+0000\n"
+"Last-Translator: 男孩不壞\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/I2P/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"
+
+#. Type: boolean
+#. Description
+#: ../i2p.templates:2001
+msgid "Should the I2P router be started at boot?"
+msgstr "I2P路由應該在開機時啟動嗎?"
+
+#. Type: boolean
+#. Description
+#: ../i2p.templates:2001
+msgid ""
+"The I2P router can be run as a daemon that starts automatically when your "
+"computer boots up. This is the recommended configuration."
+msgstr "I2P路由可以在開機時以進程方式自動啟動。這是建議的設定。"
+
+#. Type: string
+#. Description
+#: ../i2p.templates:3001
+msgid "I2P daemon user:"
+msgstr "I2P進程用戶:"
+
+#. Type: string
+#. Description
+#: ../i2p.templates:3001
+msgid ""
+"By default I2P is configured to run under the account i2psvc when running as"
+" a daemon. To use an **existing** I2P profile you may enter a different "
+"account name here. For example, if your previous I2P installation is at "
+"/home/user/i2p, you may enter 'user' here."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../i2p.templates:3001
+msgid ""
+"Very important: If a user other than the default of 'i2psvc' is entered "
+"here, the chosen username *MUST* already exist."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../i2p.templates:4001
+msgid "Memory that can be allocated to I2P:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../i2p.templates:4001
+msgid "By default, I2P will only be allowed to use up to 128MB of RAM."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../i2p.templates:4001
+msgid ""
+"High bandwidth routers, as well as routers with a lot of active torrents / "
+"plugins, may need to have this value increased."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../i2p.templates:5001
+msgid "Run I2P daemon confined with AppArmor"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../i2p.templates:5001
+msgid ""
+"With this option enabled I2P will be sandboxed with AppArmor, restricting "
+"which files and directories may be accessed by I2P."
+msgstr ""