diff --git a/app/build.gradle b/app/build.gradle
index 88fd7e76d..13d01bca7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -75,7 +75,7 @@ android {
     defaultConfig {
         // We have to list all translated languages here, because some of our libs have bogus languages that google play
         // doesn't like and we need to strip them (gr)
-        resConfigs "bg", "cs", "de", "el", "en", "es", "fi", "fr", "fr-rHT", "ga", "hr", "hu", "is", "it", "iw", "ja", "ko", "lt", "nl", "nb", "pl", "pt", "pt-rBR", "ro", "ru", "sk", "sl", "sq", "sv", "tr", "zh", "uk"
+        resConfigs "bg", "cs", "de", "el", "en", "es", "fi", "fr", "fr-rHT", "ga", "hr", "hu", "is", "it", "iw", "ja", "ko", "lt", "nl", "nb", "pl", "pt", "pt-rBR", "ro", "ru", "sk", "sl", "sq", "sv", "tr", "zh-rCN", "zh-rTW", "uk"
 
         ndk {
             // abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
diff --git a/app/src/main/java/com/geeksville/mesh/util/LanguageUtils.kt b/app/src/main/java/com/geeksville/mesh/util/LanguageUtils.kt
index 36e0fdd45..8481488ee 100644
--- a/app/src/main/java/com/geeksville/mesh/util/LanguageUtils.kt
+++ b/app/src/main/java/com/geeksville/mesh/util/LanguageUtils.kt
@@ -57,6 +57,8 @@ object LanguageUtils : Logging {
                 SYSTEM_DEFAULT -> context.getString(R.string.preferences_system_default)
                 "fr-HT" -> context.getString(R.string.fr_HT)
                 "pt-BR" -> context.getString(R.string.pt_BR)
+                "zh-CN" -> context.getString(R.string.zh_CN)
+                "zh-TW" -> context.getString(R.string.zh_TW)
                 else -> loc.getDisplayLanguage(loc)
                     .replaceFirstChar { if (it.isLowerCase()) it.titlecase(loc) else it.toString() }
             }
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
similarity index 100%
rename from app/src/main/res/values-zh/strings.xml
rename to app/src/main/res/values-zh-rCN/strings.xml
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 000000000..f7acfac25
--- /dev/null
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="channel_name">頻道名稱</string>
+    <string name="channel_options">頻道選項</string>
+    <string name="qr_code">QRCODE</string>
+    <string name="unset">取消設定</string>
+    <string name="connection_status">連線狀態</string>
+    <string name="application_icon">應用程式圖示</string>
+    <string name="unknown_username">未知的使用者名称</string>
+    <string name="send">传送</string>
+    <string name="send_text">傳送訊息</string>
+    <string name="warning_not_paired">您尚未將手機與 Meshtastic 相容的裝置配對。請先配對裝置並設置您的使用者名稱。\n\n此開源應用程式仍在開發中，如有問題，請在我們的論壇 meshtastic.discourse.group 上面發文詢問。\n\n 也可參閱我們的網頁 - www.meshtastic.org。</string>
+    <string name="you">你</string>
+    <string name="your_name">你的名稱</string>
+    <string name="analytics_okay">匿名使用統計資訊和故障報告</string>
+    <string name="looking_for_meshtastic_devices">正在尋找 Meshtastic 裝置...</string>
+    <string name="starting_pairing">開始配對</string>
+    <string name="url_for_join">加入 Meshtastic 網狀網路的 URL</string>
+    <string name="accept">接受</string>
+    <string name="cancel">取消</string>
+    <string name="change_channel">切換頻道</string>
+    <string name="are_you_sure_channel">您確定要更改頻道嗎？在您分享新的頻道設定之前，與其他節點的所有通訊都將停止。</string>
+    <string name="new_channel_rcvd">收到新的頻道 URL</string>
+    <string name="do_you_want_switch">您要切換到 \'%s\' 頻道嗎？</string>
+    <string name="permission_missing">Meshtastic 需要位置權限並啟用位置信息才能通過藍牙查找新設備。找到之後可以再關閉這權限。</string>
+    <string name="radio_sleeping">無法更改頻道，因為無線電處於休眠狀態</string>
+    <string name="report_bug">回報BUG</string>
+    <string name="report_a_bug">回報問題</string>
+    <string name="report_bug_text">您確定要報告錯誤嗎？報告後，請在 meshtastic.discourse.group 上貼文，以便我們可以將報告與您發現的問題匹配。</string>
+    <string name="report">報告</string>
+    <string name="not_paired_yet">您還沒有配對.</string>
+    <string name="change_radio">換設備</string>
+    <string name="pairing_completed">配對完成，開始服務</string>
+    <string name="pairing_failed_try_again">配對失敗，請重新選擇</string>
+    <string name="location_disabled">位置訪問已關閉,無法向設備提供位置.</string>
+    <string name="share">分享</string>
+    <string name="disconnected">已中斷連線</string>
+    <string name="device_sleeping">設備休眠中</string>
+    <string name="connected_count">已連接：%1$s 的 %2$s 在線</string>
+    <string name="list_of_nodes">網絡中的節點列表</string>
+    <string name="update_firmware">更新韌體</string>
+    <string name="ip_address">IP地址：</string>
+    <string name="connected">連接到設備</string>
+    <string name="connected_to">已連接至設備 (%s)</string>
+    <string name="not_connected">尚未联机</string>
+    <string name="connected_sleeping">已連接至無線電，但它正在休眠中</string>
+    <string name="update_to">更新到%s</string>
+    <string name="app_too_old">需要更新应用程序</string>
+    <string name="must_update">您必須在應用商店（或 Github）更新此應用程式。它太舊無法與此無線電固件通訊。請閱讀我們關於此主題的<a href="https://meshtastic.org/docs/software/android/installation">文件</a>。</string>
+    <string name="none">无 （停用）</string>
+    <string name="modem_config_short">短距離（速度快）</string>
+    <string name="modem_config_medium">中等距離（速度快）</string>
+    <string name="modem_config_long">長距離 （速度快）</string>
+    <string name="modem_config_mod_long">長距離 （中等速度）</string>
+    <string name="modem_config_very_long">遠距離（速度慢）</string>
+    <string name="modem_config_unrecognized">無法識別</string>
+    <string name="meshtastic_service_notifications">服务通知</string>
+    <string name="location_disabled_warning">您必须在设置中开启高精度定位服务</string>
+    <string name="about">關於</string>
+    <string name="a_list_of_nodes_in_the_mesh">節點列表</string>
+    <string name="text_messages">文字訊息</string>
+    <string name="channel_invalid">此頻道 URL 無效，無法使用</string>
+    <string name="debug_panel">除錯面板</string>
+    <string name="debug_last_messages">最後 500 則訊息</string>
+    <string name="clear">清除</string>
+    <string name="updating_firmware">更新韌體中，請等待最多八分鐘…</string>
+    <string name="update_successful">更新成功</string>
+    <string name="update_failed">更新失敗</string>
+    <string name="message_reception_time">消息接收时间</string>
+    <string name="message_reception_state">訊息接收狀態</string>
+    <string name="message_delivery_status">訊息傳遞狀態</string>
+    <string name="meshtastic_messages_notifications">訊息通知</string>
+    <string name="protocol_stress_test">通訊協定壓力測試</string>
+    <string name="firmware_too_old">需要韧体更新</string>
+    <string name="firmware_old">無法與此應用程式通訊，無線電韌體太舊。請前往設定面板並選擇「更新韌體」。有關詳細信息，請參閱<a href="https://meshtastic.org/docs/getting-started/flashing-firmware">我們的韌體安裝指南</a>。</string>
+    <string name="okay">好的</string>
+    <string name="must_set_region">您必須設定一個區域！</string>
+    <string name="region">地區</string>
+    <string name="cant_change_no_radio">無法更改頻道，因為裝置尚未連接。請再試一次。</string>
+    <string name="save_messages">匯出  範圍測試.csv</string>
+    <string name="reset">重置</string>
+    <string name="scan">掃描</string>
+    <string name="are_you_sure_change_default">您確定要切換到預設頻道嗎？</string>
+    <string name="reset_to_defaults">恢復預設設置</string>
+    <string name="apply">套用</string>
+    <string name="no_app_found">找不到可用于发送 URL 的应用程序。</string>
+    <string name="theme">主題</string>
+    <string name="theme_light">浅色</string>
+    <string name="theme_dark">深色</string>
+    <string name="theme_system">系統預設</string>
+    <string name="choose_theme">選擇主題</string>
+    <string name="background_required">背景定位</string>
+    <string name="why_background_required">使用此功能，您必須授予「一直允許」的位置權限選項。\n這允許 Meshtastic 讀取您的智慧手機位置，並在應用程式關閉或未使用時，將位置發送給網狀網絡中的其他成員。</string>
+    <string name="required_permissions">所需權限：</string>
+    <string name="provide_location_to_mesh">提供網格的位置</string>
+    <string name="camera_required">相機權限</string>
+    <string name="why_camera_required">我們必須獲得訪問攝像頭的權限才能讀取 QR 碼。不會保存任何圖片或影片。</string>
+    <string name="notification_required">通知欄權限</string>
+    <string name="why_notification_required">Meshtastic 需要取得服務和訊息通知的權限。</string>
+    <string name="notification_denied">通知權限已被拒絕。要啟用通知，請前往：Android 設置 &gt; 應用程式 &gt; Meshtastic &gt; 通知。</string>
+    <string name="modem_config_slow_short">短距離（速度慢）</string>
+    <string name="modem_config_slow_medium">中等距離（速度慢）</string>
+    <plurals name="delete_messages">
+        <item quantity="other">刪除 %s 訊息?</item>
+    </plurals>
+    <string name="delete">刪除</string>
+    <string name="delete_for_everyone">也從所有人的聊天紀錄中刪除</string>
+    <string name="delete_for_me">從我的聊天紀錄中刪除</string>
+    <string name="select_all">選擇全部</string>
+    <string name="modem_config_slow_long">長距離（速度慢）</string>
+    <string name="map_style_selection">樣式選擇</string>
+    <string name="map_download_region">下載區域</string>
+    <string name="name">名稱</string>
+    <string name="description">描述說明</string>
+    <string name="locked">鎖定</string>
+    <string name="save">儲存</string>
+    <string name="preferences_language">語言</string>
+    <string name="preferences_system_default">系統預設</string>
+    <string name="resend">重新傳送</string>
+    <string name="shutdown">關機</string>
+    <string name="reboot">重新開機</string>
+    <string name="traceroute">路由追蹤</string>
+    <string name="intro_show">顯示介紹指南</string>
+    <string name="intro_welcome">歡迎來到 Meshtastic</string>
+    <string name="intro_welcome_text">Meshtastic 是一個開源、離網、加密的通訊平台。Meshtastic 無線電組成網狀網絡，使用 LoRa 協議傳送文字訊息進行通訊。</string>
+    <string name="intro_started">…讓我們開始吧！</string>
+    <string name="intro_started_text">使用藍牙、序列埠或 WiFi 連接您的 Meshtastic 設備。 \n\n您可以在 www.meshtastic.org/docs/hardware 查看兼容的設備</string>
+    <string name="intro_encryption">"設置加密"</string>
+    <string name="intro_encryption_text">作為標準，設置了默認加密密鑰。 要啟用您自己的頻道和增強加密，請轉到頻道選項卡並更改頻道名稱，這將為 AES256 加密設置一個隨機密鑰。 \n\n要與其他設備通信，他們需要掃描您的二維碼或點擊共享鏈接來配置頻道設置。</string>
+    <string name="message">訊息:</string>
+    <string name="quick_chat">快速聊天選項</string>
+    <string name="quick_chat_new">新的快速聊天</string>
+    <string name="quick_chat_edit">編輯快速聊天</string>
+    <string name="quick_chat_append">附加到訊息</string>
+    <string name="quick_chat_instant">实时发送</string>
+    <string name="factory_reset">恢复出厂设置</string>
+    <string name="factory_reset_description">这将清除你已经完成的所有设备设定。</string>
+    <string name="bluetooth_disabled">藍牙已禁用</string>
+    <string name="permission_missing_31">Meshtastic 需要附近設備許可才能通過藍牙查找和連接設備。 您可以在不使用時將其關閉。</string>
+    <string name="direct_message">直接發訊息</string>
+    <string name="nodedb_reset">節點數據庫重置</string>
+    <string name="nodedb_reset_description">這將從該列表中清除所有節點。</string>
+    <string name="ignore">忽略</string>
+    <string name="ignore_add">將 \'%s\' 加入忽略清單嗎？</string>
+    <string name="ignore_remove">從忽略清單中移除 \'%s\' 嗎？</string>
+    <string name="map_select_download_region">選擇下載地區</string>
+    <string name="map_tile_download_estimate">瓷磚下載估計:</string>
+    <string name="map_start_download">開始下載</string>
+    <string name="request_position">要求位置</string>
+    <string name="close">关闭</string>
+    <string name="device_settings">設備設定</string>
+    <string name="module_settings">模組設定</string>
+    <string name="add">新增</string>
+    <string name="calculating">正在計算……</string>
+    <string name="map_offline_manager">離線管理</string>
+    <string name="map_cache_size">當前緩存大小</string>
+    <string name="map_cache_info">緩存容量: %1$.2f MB\n緩存使用: %2$.2f MB</string>
+    <string name="map_clear_tiles">清除下載的圖磚</string>
+    <string name="map_tile_source">圖磚來源</string>
+    <string name="map_purge_success">清除 %s 的 SQL 快取</string>
+    <string name="map_purge_fail">清除 SQL 快取失败，请查看 logcat 纪录</string>
+    <string name="map_cache_manager">緩存管理員</string>
+    <string name="map_download_complete">下載已完成！</string>
+    <string name="map_download_errors">下載完成，但有 %d 個錯誤</string>
+    <string name="map_cache_tiles">%d 圖磚</string>
+    <string name="map_subDescription">方位：%1$d° 距離：%2$s</string>
+    <string name="waypoint_edit">編輯航點</string>
+    <string name="waypoint_delete">刪除航點?</string>
+    <string name="waypoint_new">新建航點</string>
+    <string name="waypoint_received">收到編輯航點：%s</string>
+    <string name="error_duty_cycle">達到循環工作週期限制。目前無法發送訊息，請稍後再試。</string>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e16889f9d..da03bc29e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,6 +2,8 @@
     // Language tags native names (not available via .getDisplayLanguage)
     <string name="fr_HT" translatable="false">Kreyòl ayisyen</string>
     <string name="pt_BR" translatable="false">Português do Brasil</string>
+    <string name="zh_CN" translatable="false">简体中文</string>
+    <string name="zh_TW" translatable="false">繁體中文</string>
 
     <string name="app_name" translatable="false">Meshtastic</string>
     <string name="sample_distance" translatable="false">2.13 km</string>
diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml
index d9d8c4226..d0a85a7cd 100644
--- a/app/src/main/res/xml/locales_config.xml
+++ b/app/src/main/res/xml/locales_config.xml
@@ -3,7 +3,8 @@
    <locale android:name="en"/> <!-- English (ultimate fallback locale) -->
    <locale android:name="bg"/> <!-- Bulgarian -->
    <locale android:name="cs"/> <!-- Czech -->
-   <locale android:name="zh"/> <!-- Chinese -->
+   <locale android:name="zh-CN"/> <!-- Chinese Simplified -->
+   <locale android:name="zh-TW"/> <!-- Chinese Traditional -->
    <locale android:name="de"/> <!-- German -->
    <locale android:name="es"/> <!-- Spanish (Spain) -->
    <locale android:name="fr"/> <!-- French (France) -->