diff --git a/mobile/src/main/res/values-ja/strings.xml b/mobile/src/main/res/values-ja/strings.xml
index c4a9159e..c60609c2 100644
--- a/mobile/src/main/res/values-ja/strings.xml
+++ b/mobile/src/main/res/values-ja/strings.xml
@@ -1,36 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+<string name="app_name">"Shadowsocks"</string>
 <string name="quick_toggle">"ON/OFF"</string>
 
 <!-- misc -->
 <string name="profile">"プロファイル"</string>
 <string name="profile_summary">"新規作成または既存ファイルを開く"</string>
-<string name="nat">"NAT モード (デバックのみ)"</string>
-<string name="nat_summary">"VPN モードから NAT モードに切り替えるには ROOT 権限が必要です"</string>
 <string name="remote_dns">"リモートDNS"</string>
 <string name="stat_summary">"送信済み: \t%3$s\t↑\t%1$s/s
 受信済み: \t%4$s\t↓\t%2$s/s"</string>
+<string name="stat_profiles">"%1$s↑\t%2$s↓"</string>
+<string name="traffic_summary">"%1$s/s↑\t%2$s/s↓"</string>
+<plurals name="bytes">
+<item quantity="other">"Byte"</item>
+</plurals>
 <string name="connection_test_pending">"接続状況確認"</string>
 <string name="connection_test_testing">"テスト中…"</string>
 <string name="connection_test_available">"成功: %dmsの遅延"</string>
 <string name="connection_test_error">"失敗しました：%s"</string>
 <string name="connection_test_fail">"インターネット利用不可"</string>
-<string name="connection_test_error_status_code">"ステータスコード無効（#%d）"</string>
+<string name="connection_test_error_status_code">"ステータスコード無効: #%d"</string>
+
+<!-- proxy category -->
+<string name="proxy_cat">"サーバー設定"</string>
 
 <!-- proxy category -->
 <string name="profile_name">"サーバー名"</string>
 <string name="proxy">"サーバーアドレス"</string>
 <string name="remote_port">"リモートポート"</string>
-<string name="port">"ローカルポート"</string>
 <string name="sitekey">"パスワード"</string>
 <string name="enc_method">"暗号化方式"</string>
 
+<!-- feature category -->
+<string name="feature_cat">"ファンクション設定"</string>
+
 <!-- feature category -->
 <string name="ipv6">"IPv6 プロキシ"</string>
 <string name="ipv6_summary">"リモートサーバーに IPv6 パケットを転送"</string>
 <string name="route_list">"プロキシ方式"</string>
 <string name="route_entry_gfwlist">"中国本土からアクセス不可なアドレス以外を迂回する"</string>
+
 <string name="proxied_apps">"アプリ別のプロキシを使用"</string>
+
 <string name="proxied_apps_summary">"アプリ別でプロキシを指定、Android 4.x では必ずNATモードを使用して下さい"</string>
 <string name="on">"ON"</string>
 <string name="bypass_apps">"バイパスモード（迂回モード）"</string>
@@ -46,28 +57,28 @@
 <string name="forward_success">"バックグラウンドでサービスを開始しました"</string>
 <string name="invalid_server">"サーバーが無効です"</string>
 <string name="service_failed">"リモートサーバーに接続できません"</string>
-<string name="nat_deprecated">"注意：Android 5.0 及びそれ以降のバージョンでは NAT モードの使用はお勧めしません"</string>
-<string name="nat_no_root">"NAT モードは ROOT 権限が必要です"</string>
-<string name="switch_to_vpn">"VPN モードに切り替える"</string>
 <string name="stop">"中止"</string>
 <string name="stopping">"停止中……"</string>
 <string name="vpn_error">"バックグランドサービスの起動に失敗しました：%s"</string>
 <string name="reboot_required">"VPN サービスの起動に失敗しました、デバイスの再起動を試みて下さい"</string>
 <string name="profile_invalid_input">"有効なプロファイルが見つかりません"</string>
 
+<!-- alert category -->
+<string name="yes">"はい"</string>
+<string name="no">"いいえ"</string>
+
 <!-- alert category -->
 <string name="close">"閉じる"</string>
 <string name="profile_empty">"プロファイルを選択して下さい"</string>
 <string name="proxy_empty">"サーバアドレスやパスワードの入力が必要です"</string>
 <string name="connect">"接続"</string>
-<string name="recovering">"リセット中……"</string>
-<string name="remove_profile">"このプロファイルを削除「%s」?"</string>
+<string name="remove_profile">"このプロファイルを削除 %s?"</string>
 
 <!-- menu category -->
 <string name="profiles">"プロファイル"</string>
 <string name="settings">"オプション設定"</string>
 <string name="faq">"よくある質問"</string>
-<string name="recovery">"リセット"</string>
+<string name="faq_url">"https://github.com/shadowsocks/shadowsocks-android/blob/master/.github/faq.md"</string>
 <string name="about">"本アプリについて"</string>
 <string name="about_title">"Shadowsocks %s"</string>
 <string name="edit">"編集"</string>
@@ -83,14 +94,16 @@
 
 <!-- profile -->
 <string name="profile_config">"プロファイル編集"</string>
+<string name="unsaved_changes_prompt">"変更は適応されておりません、保存しますか？"</string>
+<string name="apply">"適用"</string>
 <string name="delete">"削除"</string>
 <string name="delete_confirm_prompt">"このプロファイルを削除しますか"</string>
 <string name="share_qr_nfc">"QR コード / NFC"</string>
 <string name="add_profile_dialog">"Shadowsocks用プロファイルを追加しますか"</string>
 <string name="add_profile_methods_scan_qr_code">"QR コードを読み取る"</string>
-<string name="add_profile_methods_manual_settings">"手動設定"</string>
 <plurals name="removed">
-<item quantity="other">"削除済み"</item>
+<item quantity="other">"削除しました
+%d 個のアイテムを削除しました"</item>
 </plurals>
 <string name="undo">"元に戻す"</string>
 
@@ -106,7 +119,6 @@
 <string name="received">"受信済み:"</string>
 <string name="connecting">"接続中…"</string>
 <string name="vpn_connected">"接続済み、タップして接続状況をチェック"</string>
-<string name="nat_connected">"接続済み"</string>
 <string name="not_connected">"未接続"</string>
 
 <!-- acl -->
@@ -119,20 +131,34 @@
 <string name="route_entry_bypass_chn">"中国本土のアドレスを迂回する"</string>
 <string name="route_entry_bypass_lan_chn">"LAN 及び中国本土のアドレスを迂回する"</string>
 <string name="route_entry_chinalist">"中国本土のアドレス以外を迂回する"</string>
+
 <string name="proxied_apps_summary_v21">"選択したアプリにプロキシを設定する"</string>
+
 <string name="acl_rule_templates_generic">"URL/サブネット/ホスト名 PCRE パターン"</string>
 <string name="acl_rule_templates_domain">"ドメイン及び全てのサブドメイン"</string>
 
 <!-- plugin -->
 <string name="plugin">"プラグイン"</string>
-<string name="plugin_configure">"設定..."</string>
+<string name="plugin_configure">"設定…"</string>
 <string name="plugin_disabled">"無効"</string>
-<string name="plugin_unknown">"不明なプラグイン"</string>
+<string name="plugin_unknown">"不明なプラグイン %s"</string>
 <string name="plugin_untrusted">"警告：このプラグインは信頼されていないソースからの可能性があります"</string>
-<string name="profile_plugin">"プラグイン"</string>
+<string name="profile_plugin">"プラグイン: %s"</string>
 <string name="add_profile_scanner_permission_required">"QRコードをスキャンするにはカメラ権限が必要です。"</string>
 
 <!-- notification category -->
 <string name="service_vpn">"VPNサービス"</string>
-<string name="service_nat">"NATサービス"</string>
-</resources>
\ No newline at end of file
+<string name="add_profile_methods_manual_settings">"手動設定"</string>
+<string name="advanced">"アドバンス"</string>
+<string name="service_mode">"サービスモード"</string>
+<string name="service_mode_proxy">"プロキシのみ"</string>
+<string name="service_mode_vpn">"VPN"</string>
+<string name="service_mode_transproxy">"トランスプロキシ"</string>
+<string name="port_proxy">"SOCKS5プロキシポート"</string>
+<string name="port_local_dns">"ローカルDNSポート"</string>
+<string name="port_transproxy">"トランスプロキシポート"</string>
+<string name="service_proxy">"プロキシサービス"</string>
+<string name="service_transproxy">"トランスプロキシサービス"</string>
+<string name="vpn_permission_denied">"VPNサービス作成のアクセス許可が拒否されました"</string>
+<string name="auto_connect_summary_v24">"起動時にShadowsockを有効。 VPN常時接続の使用をお勧めします"</string>
+</resources>
diff --git a/mobile/src/main/res/values-ko/strings.xml b/mobile/src/main/res/values-ko/strings.xml
index 16886cbe..1bc22c62 100644
--- a/mobile/src/main/res/values-ko/strings.xml
+++ b/mobile/src/main/res/values-ko/strings.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+<string name="app_name">"Shadowsocks"</string>
 <string name="quick_toggle">"켜기/끄기"</string>
 
 <!-- misc -->
 <string name="profile">"프로필"</string>
 <string name="profile_summary">"다른 프로필로 전환하거나 새 프로필 추가"</string>
-<string name="nat">"NAT 모드 (지원 중단)"</string>
-<string name="nat_summary">"VPN 모드 대신 NAT 모드를 사용합니다. 루트 권한이 필요합니다."</string>
 <string name="remote_dns">"원격 DNS"</string>
 <string name="stat_summary">"송신: \t%3$s\t↑\t%1$s/s
 수신: \t%4$s\t↓\t%2$s/s"</string>
+<string name="stat_profiles">"%1$s↑\t%2$s↓"</string>
+<string name="traffic_summary">"%1$s/s↑\t%2$s/s↓"</string>
+<plurals name="bytes">
+<item quantity="other">"Byte"</item>
+</plurals>
 <string name="connection_test_pending">"인터넷 연결 상태 검사하기"</string>
 <string name="connection_test_testing">"검사 중…"</string>
 <string name="connection_test_available">"성공: 지연시간 %dms"</string>
@@ -17,19 +21,27 @@
 <string name="connection_test_fail">"인터넷에 연결할 수 없습니다"</string>
 <string name="connection_test_error_status_code">"오류 코드: #%d"</string>
 
+<!-- proxy category -->
+<string name="proxy_cat">"서버 설정"</string>
+
 <!-- proxy category -->
 <string name="profile_name">"프로필 이름"</string>
 <string name="proxy">"서버 주소"</string>
 <string name="remote_port">"원격 포트"</string>
-<string name="port">"로컬 포트"</string>
 <string name="sitekey">"비밀번호"</string>
 <string name="enc_method">"암호화 방법"</string>
 
+<!-- feature category -->
+<string name="feature_cat">"기능 설정"</string>
+
 <!-- feature category -->
 <string name="ipv6">"IPv6 라우팅"</string>
 <string name="ipv6_summary">"IPv6 트래픽도 원격으로 리다이렉트 합니다"</string>
 <string name="route_list">"라우팅 대상"</string>
+<string name="route_entry_gfwlist">"GFW List"</string>
+
 <string name="proxied_apps">"원하는 앱만 프락시 적용하기"</string>
+
 <string name="proxied_apps_summary">"선택한 앱에만 프락시를 적용합니다. Android 4.x 이하에서는 NAT 모드를 써야 합니다."</string>
 <string name="on">"활성화"</string>
 <string name="bypass_apps">"선택된 앱들만 프록시 적용 제외하기"</string>
@@ -45,31 +57,34 @@
 <string name="forward_success">"Shadowsocks가 시작되었습니다"</string>
 <string name="invalid_server">"잘못된 서버 이름입니다"</string>
 <string name="service_failed">"원격 서버에 접속하는 데 실패했습니다"</string>
-<string name="nat_deprecated">"경고: NAT 모드는 Android 5.0부터 지원 중단되었습니다"</string>
-<string name="nat_no_root">"NAT 모드는 루트 권한이 필요합니다"</string>
-<string name="switch_to_vpn">"VPN 모드로 전환"</string>
 <string name="stop">"중지"</string>
 <string name="stopping">"종료 중…"</string>
+<string name="vpn_error">"%s"</string>
 <string name="reboot_required">"VPN 서비스를 시작하는 데 실패했습니다. 장치를 재시작해 보세요."</string>
 <string name="profile_invalid_input">"올바른 프로필 데이터를 찾을 수 없습니다"</string>
 
+<!-- alert category -->
+<string name="yes">"예"</string>
+<string name="no">"아니오"</string>
+
 <!-- alert category -->
 <string name="close">"닫기"</string>
 <string name="profile_empty">"프로필을 선택해 주세요"</string>
 <string name="proxy_empty">"서버 주소와 비밀번호는 반드시 입력해야 합니다"</string>
 <string name="connect">"접속"</string>
-<string name="recovering">"재설정 중…"</string>
 <string name="remove_profile">"'%s' 프로필을 삭제 하시겠습니까?"</string>
 
 <!-- menu category -->
 <string name="profiles">"프로필"</string>
 <string name="settings">"설정"</string>
 <string name="faq">"자주 묻는 질문"</string>
-<string name="recovery">"재설정"</string>
+<string name="faq_url">"https://github.com/shadowsocks/shadowsocks-android/blob/master/.github/faq.md"</string>
 <string name="about">"이 앱에 대하여"</string>
+<string name="about_title">"Shadowsocks %s"</string>
 <string name="edit">"수정"</string>
 <string name="share">"공유"</string>
 <string name="add_profile">"프로필 추가"</string>
+<string name="action_apply_all">"Apply Settings to All Profiles"</string>
 <string name="action_export">"클립보드로 내보내기"</string>
 <string name="action_import">"클립보드에서 불러오기"</string>
 <string name="action_export_msg">"성공적으로 내보냈습니다"</string>
@@ -79,27 +94,46 @@
 
 <!-- profile -->
 <string name="profile_config">"프로필 설정"</string>
+<string name="unsaved_changes_prompt">"변경 사항이 저장되지 않았습니다. 저장하시겠습니까?"</string>
+<string name="apply">"적용"</string>
 <string name="delete">"삭제"</string>
 <string name="delete_confirm_prompt">"정말 이 프로필을 삭제하시겠습니까?"</string>
 <string name="share_qr_nfc">"QR 코드/NFC"</string>
 <string name="add_profile_dialog">"이 Shadowsocks 프로필을 추가하시겠습니까?"</string>
 <string name="add_profile_methods_scan_qr_code">"QR 코드 읽기"</string>
-<string name="add_profile_methods_manual_settings">"손수 써넣기"</string>
 <plurals name="removed">
 <item quantity="other">"삭제했습니다"</item>
 </plurals>
 <string name="undo">"실행 취소"</string>
 
+<!-- tasker -->
+<string name="toggle_service_state">"Start the service"</string>
+<string name="start_service_default">"Connect to the current server"</string>
+<string name="start_service">"Connect to %s"</string>
+<string name="stop_service">"Switch to %s"</string>
+<string name="profile_default">"Use the current profile"</string>
+
 <!-- status -->
 <string name="sent">"송신:"</string>
 <string name="received">"수신:"</string>
 <string name="connecting">"연결 중…"</string>
 <string name="vpn_connected">"연결 완료. 탭 하면 연결 상태를 검사합니다."</string>
-<string name="nat_connected">"연결 완료"</string>
+<string name="not_connected">"Not connected"</string>
 
 <!-- acl -->
 <string name="custom_rules">"사용자 정의 규칙"</string>
+<string name="action_selection">"Selection…"</string>
+<string name="action_add_rule">"Add rule(s)…"</string>
+<string name="edit_rule">"Edit rule"</string>
+<string name="route_entry_all">"All"</string>
+<string name="route_entry_bypass_lan">"Bypass LAN"</string>
+<string name="route_entry_bypass_chn">"Bypass mainland China"</string>
+<string name="route_entry_bypass_lan_chn">"Bypass LAN &amp; mainland China"</string>
+<string name="route_entry_chinalist">"China List"</string>
+<string name="proxied_apps_summary_v21">"Configure VPN mode for selected apps"</string>
+
 <string name="acl_rule_templates_generic">"URL, 서브넷 혹은 호스트 이름 PCRE 패턴"</string>
+<string name="acl_rule_templates_domain">"Domain name and all its subdomain names"</string>
 
 <!-- plugin -->
 <string name="plugin">"플러그인"</string>
@@ -109,4 +143,21 @@
 <string name="plugin_untrusted">"경고: 이 플러그인은 신뢰할 수 있는 출처에서 온 것이 아닌 것 같습니다"</string>
 <string name="profile_plugin">"플러그인: %s"</string>
 <string name="add_profile_scanner_permission_required">"QR 코드를 읽어 들이려면 카메라 권한이 필요합니다"</string>
-</resources>
\ No newline at end of file
+
+<!-- notification category -->
+<string name="service_vpn">"VPN Service"</string>
+<string name="add_profile_methods_manual_settings">"Manual Settings"</string>
+<string name="advanced">"Advanced"</string>
+<string name="service_mode">"Service mode"</string>
+<string name="service_mode_proxy">"Proxy only"</string>
+<string name="service_mode_vpn">"VPN"</string>
+<string name="service_mode_transproxy">"Transproxy"</string>
+<string name="port_proxy">"SOCKS5 proxy port"</string>
+<string name="port_local_dns">"Local DNS port"</string>
+<string name="port_transproxy">"Transproxy port"</string>
+<string name="service_proxy">"Proxy Service"</string>
+<string name="service_transproxy">"Transproxy Service"</string>
+<string name="vpn_permission_denied">"Permission denied to create a VPN service"</string>
+<string name="auto_connect_summary_v24">"Enable Shadowsocks on startup. Recommended to use always-on VPN
+    instead"</string>
+</resources>
diff --git a/mobile/src/main/res/values-ru/strings.xml b/mobile/src/main/res/values-ru/strings.xml
index 6b9d8fcf..dca04f20 100644
--- a/mobile/src/main/res/values-ru/strings.xml
+++ b/mobile/src/main/res/values-ru/strings.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+<string name="app_name">"Shadowsocks"</string>
 <string name="quick_toggle">"Подключение"</string>
 
 <!-- misc -->
 <string name="profile">"Профиль"</string>
 <string name="profile_summary">"Переключить на другой профиль или добавить новые"</string>
-<string name="nat">"Режим NAT (не рекомендуется)"</string>
-<string name="nat_summary">"Использовать режим NAT вместо VPN. Требует ROOT прав."</string>
 <string name="remote_dns">"Удалённый DNS"</string>
 <string name="stat_summary">"Отправлено: \t%3$s\t↑\t%1$s/s
 Получено: \t%4$s\t↓\t%2$s/s"</string>
@@ -26,20 +25,27 @@
 <string name="connection_test_fail">"Интернет недоступен"</string>
 <string name="connection_test_error_status_code">"Код ошибки: #%d"</string>
 
+<!-- proxy category -->
+<string name="proxy_cat">"Настройки Сервера"</string>
+
 <!-- proxy category -->
 <string name="profile_name">"Имя Профиля"</string>
 <string name="proxy">"Сервер"</string>
 <string name="remote_port">"Удалённый порт"</string>
-<string name="port">"Локальный порт"</string>
 <string name="sitekey">"Пароль"</string>
 <string name="enc_method">"Метод Шифрования"</string>
 
+<!-- feature category -->
+<string name="feature_cat">"Дополнительные Настройки"</string>
+
 <!-- feature category -->
 <string name="ipv6">"IPv6 Маршрут"</string>
 <string name="ipv6_summary">"Перенаправлять трафик IPv6 на удалённый сервер"</string>
 <string name="route_list">"Маршрут"</string>
 <string name="route_entry_gfwlist">"Список GFW"</string>
+
 <string name="proxied_apps">"Прокси для выбранных приложений"</string>
+
 <string name="proxied_apps_summary">"Установить прокси для выбранных приложений, требует режим NAT под Android 4.x"</string>
 <string name="on">"Вкл"</string>
 <string name="bypass_apps">"В обход прокси"</string>
@@ -55,25 +61,28 @@
 <string name="forward_success">"Shadowsocks запущен."</string>
 <string name="invalid_server">"Неправильное имя сервера"</string>
 <string name="service_failed">"Ошибка при подключении к удалённому серверу"</string>
-<string name="nat_deprecated">"ВНИМАНИЕ: режим NAT не рекомендуется, начиная с Android 5.0"</string>
-<string name="nat_no_root">"Режим NAT требует наличия ROOT прав"</string>
-<string name="switch_to_vpn">"Переключить на режим VPN"</string>
 <string name="stop">"Остановить"</string>
 <string name="stopping">"Останавливается…"</string>
+<string name="vpn_error">"%s"</string>
 <string name="reboot_required">"Не удалось запустить службу VPN. Возможно, требуется перезагрузить ваше устройство."</string>
+<string name="profile_invalid_input">"No valid profile data found."</string>
+
+<!-- alert category -->
+<string name="yes">"Да"</string>
+<string name="no">"Нет"</string>
 
 <!-- alert category -->
 <string name="close">"Закрыть"</string>
 <string name="profile_empty">"Пожалуйста, выберите профиль"</string>
 <string name="proxy_empty">"Прокси/Пароль не должны быть пустыми"</string>
 <string name="connect">"Подключить"</string>
-<string name="recovering">"Сброс…"</string>
 <string name="remove_profile">"Удалить этот профиль %s?"</string>
 
 <!-- menu category -->
 <string name="profiles">"Профили"</string>
 <string name="settings">"Настройки"</string>
-<string name="recovery">"Сброс"</string>
+<string name="faq">"FAQ"</string>
+<string name="faq_url">"https://github.com/shadowsocks/shadowsocks-android/blob/master/.github/faq.md"</string>
 <string name="about">"О приложении"</string>
 <string name="about_title">"Shadowsocks %s"</string>
 <string name="edit">"Изменить"</string>
@@ -89,14 +98,15 @@
 
 <!-- profile -->
 <string name="profile_config">"Настройка профиля"</string>
+<string name="unsaved_changes_prompt">"Изменения не сохранены. Сохранить?"</string>
+<string name="apply">"Применить"</string>
 <string name="delete">"Удалить"</string>
 <string name="delete_confirm_prompt">"Вы уверены, что хотите удалить этот профиль?"</string>
 <string name="share_qr_nfc">"QR-код/NFC"</string>
 <string name="add_profile_dialog">"Добавить этот Профиль Shadowsocks?"</string>
 <string name="add_profile_methods_scan_qr_code">"Сканировать QR-код"</string>
-<string name="add_profile_methods_manual_settings">"Ручные настройки"</string>
 <plurals name="removed">
-<item quantity="one">"Удалено"</item>
+<item quantity="one">"Удалено %d элементов"</item>
 <item quantity="few">"Удалено %d элемента"</item>
 <item quantity="many">"Удалено %d элементов"</item>
 <item quantity="other">"Удалено %d элементов"</item>
@@ -113,31 +123,49 @@
 <!-- status -->
 <string name="sent">"Отправлено:"</string>
 <string name="received">"Получено:"</string>
-<string name="connecting">"Соединение..."</string>
+<string name="connecting">"Соединение…"</string>
 <string name="vpn_connected">"Подключено, нажмите для проверки соединения"</string>
-<string name="nat_connected">"Подключено"</string>
 <string name="not_connected">"Не подключено"</string>
 
 <!-- acl -->
 <string name="custom_rules">"Пользовательские правила"</string>
-<string name="action_selection">"Выделение..."</string>
-<string name="action_add_rule">"Добавить правило..."</string>
+<string name="action_selection">"Выделение…"</string>
+<string name="action_add_rule">"Добавить правило…"</string>
 <string name="edit_rule">"Редактировать правило"</string>
 <string name="route_entry_all">"Все"</string>
 <string name="route_entry_bypass_lan">"Все, кроме LAN"</string>
 <string name="route_entry_bypass_chn">"Все, кроме Китая"</string>
 <string name="route_entry_bypass_lan_chn">"Все, кроме LAN и Китая"</string>
 <string name="route_entry_chinalist">"Список Китай"</string>
+
 <string name="proxied_apps_summary_v21">"Установить прокси для выбранных приложений"</string>
+
 <string name="acl_rule_templates_generic">"URL/Подсеть/Регулярное выражение (PCRE) имени хоста"</string>
 <string name="acl_rule_templates_domain">"Доменное имя и все его поддомены"</string>
 
 <!-- plugin -->
 <string name="plugin">"Плагин"</string>
-<string name="plugin_configure">"Настроить..."</string>
+<string name="plugin_configure">"Настроить…"</string>
 <string name="plugin_disabled">"Отключён"</string>
 <string name="plugin_unknown">"Неизвестный плагин %s"</string>
 <string name="plugin_untrusted">"Предупреждение: этот плагин получен из недоверенного источника."</string>
 <string name="profile_plugin">"Плагин: %s"</string>
 <string name="add_profile_scanner_permission_required">"Разрешение камеры требуется для сканирования QR код."</string>
-</resources>
\ No newline at end of file
+
+<!-- notification category -->
+<string name="service_vpn">"VPN Service"</string>
+<string name="add_profile_methods_manual_settings">"Manual Settings"</string>
+<string name="advanced">"Advanced"</string>
+<string name="service_mode">"Service mode"</string>
+<string name="service_mode_proxy">"Proxy only"</string>
+<string name="service_mode_vpn">"VPN"</string>
+<string name="service_mode_transproxy">"Transproxy"</string>
+<string name="port_proxy">"SOCKS5 proxy port"</string>
+<string name="port_local_dns">"Local DNS port"</string>
+<string name="port_transproxy">"Transproxy port"</string>
+<string name="service_proxy">"Proxy Service"</string>
+<string name="service_transproxy">"Transproxy Service"</string>
+<string name="vpn_permission_denied">"Permission denied to create a VPN service"</string>
+<string name="auto_connect_summary_v24">"Enable Shadowsocks on startup. Recommended to use always-on VPN
+    instead"</string>
+</resources>
diff --git a/mobile/src/main/res/values-zh-rCN/strings.xml b/mobile/src/main/res/values-zh-rCN/strings.xml
index 1c7bb221..904743d8 100644
--- a/mobile/src/main/res/values-zh-rCN/strings.xml
+++ b/mobile/src/main/res/values-zh-rCN/strings.xml
@@ -1,77 +1,93 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
 <string name="app_name">"影梭"</string>
+
 <string name="quick_toggle">"开关"</string>
 
 <!-- misc -->
 <string name="profile">"配置文件"</string>
+
 <string name="profile_summary">"新建或切换到其他配置文件"</string>
-<string name="nat">"NAT 模式（仅限调试）"</string>
-<string name="nat_summary">"从 VPN 模式切换为 NAT 模式，需要 ROOT 权限"</string>
+
 <string name="remote_dns">"远程 DNS"</string>
-<string name="stat_summary">"发送: \t%3$s\t↑\t%1$s/s
-接收: \t%4$s\t↓\t%2$s/s"</string>
+
+<string name="stat_summary">"上传: \t%3$s\t↑\t%1$s/s
+下载: \t%4$s\t↓\t%2$s/s"</string>
+<string name="stat_profiles">"1$s↑\t%2$s↓"</string>
+<string name="traffic_summary">"1$s/s↑\t%2$s/s↓"</string>
+
 <plurals name="bytes">
 <item quantity="other">"字节"</item>
 </plurals>
+
 <string name="connection_test_pending">"检查网络连接"</string>
 <string name="connection_test_testing">"测试中…"</string>
-<string name="connection_test_available">"连接有效：延时 %d 毫秒"</string>
+<string name="connection_test_available">"连接成功：延时 %d 毫秒"</string>
+
 <string name="connection_test_error">"失败：%s"</string>
 <string name="connection_test_fail">"无互联网连接"</string>
+
 <string name="connection_test_error_status_code">"状态码无效（#%d）"</string>
 
+<!-- proxy category -->
+<string name="proxy_cat">"服务器设置"</string>
+
 <!-- proxy category -->
 <string name="profile_name">"配置名称"</string>
+
 <string name="proxy">"服务器"</string>
 <string name="remote_port">"远程端口"</string>
-<string name="port">"本地端口"</string>
 <string name="sitekey">"密码"</string>
-<string name="enc_method">"加密方法"</string>
+<string name="enc_method">"加密方式"</string>
+
+<!-- feature category -->
+<string name="feature_cat">"功能设置"</string>
 
 <!-- feature category -->
 <string name="ipv6">"IPv6 路由"</string>
-<string name="ipv6_summary">"向远程服务器转发 IPv6 流量"</string>
+<string name="ipv6_summary">"转发 IPv6 流量到远程服务器"</string>
 <string name="route_list">"路由"</string>
-<string name="route_entry_gfwlist">"仅代理中国大陆无法访问的地址"</string>
-<string name="proxied_apps">"分应用代理"</string>
-<string name="proxied_apps_summary">"为应用程序分别设置代理，在 4.x 下需要启用 NAT 模式"</string>
-<string name="on">"开"</string>
+<string name="route_entry_gfwlist">"GFW 列表"</string>
+<string name="proxied_apps">"分应用 VPN"</string>
+
+<string name="proxied_apps_summary">"允许部分应用绕过 VPN"</string>
+<string name="on">"启用"</string>
 <string name="bypass_apps">"绕行模式"</string>
-<string name="bypass_apps_summary">"启用该选项，以使所选应用程序的流量不经过代理"</string>
+<string name="bypass_apps_summary">"绕过选择的应用"</string>
 <string name="auto_connect">"自动连接"</string>
-<string name="auto_connect_summary">"随系统启动后台服务"</string>
+<string name="auto_connect_summary">"允许 Shadowsocks 随系统启动"</string>
 <string name="tcp_fastopen_summary">"切换需要 ROOT 权限"</string>
-<string name="tcp_fastopen_summary_unsupported">"不支持的内核版本：%s &lt; 3.7.1"</string>
+<string name="tcp_fastopen_summary_unsupported">"不支持的内核版本: %s &lt; 3.7.1"</string>
 <string name="udp_dns">"DNS 转发"</string>
-<string name="udp_dns_summary">"通过 UDP 将所有 DNS 查询全部转发至远程服务器"</string>
+<string name="udp_dns_summary">"转发所有 DNS 请求到远程服务器"</string>
 
 <!-- notification category -->
 <string name="forward_success">"后台服务已开始运行。"</string>
 <string name="invalid_server">"服务器名无效"</string>
 <string name="service_failed">"无法连接远程服务器"</string>
-<string name="nat_deprecated">"警告：在 Android 5.0 及更高版本中不建议使用 NAT 模式"</string>
-<string name="nat_no_root">"NAT 模式需要 ROOT 权限"</string>
-<string name="switch_to_vpn">"切换到 VPN 模式"</string>
 <string name="stop">"停止"</string>
 <string name="stopping">"正在关闭…"</string>
 <string name="vpn_error">"后台服务启动失败：%s"</string>
 <string name="reboot_required">"VPN 服务启动失败。你可能需要重启设备。"</string>
 <string name="profile_invalid_input">"未找到有效的配置文件。"</string>
 
+<!-- alert category -->
+<string name="yes">"是"</string>
+<string name="no">"否"</string>
+
 <!-- alert category -->
 <string name="close">"关闭"</string>
 <string name="profile_empty">"请选择配置文件"</string>
 <string name="proxy_empty">"代理服务器地址及密码不能为空"</string>
 <string name="connect">"连接"</string>
-<string name="recovering">"重置中…"</string>
 <string name="remove_profile">"删除此配置文件“%s”？"</string>
 
 <!-- menu category -->
 <string name="profiles">"配置文件"</string>
 <string name="settings">"设置选项"</string>
 <string name="faq">"常见问题"</string>
-<string name="recovery">"重置"</string>
+<string name="faq_url">"https://github.com/shadowsocks/shadowsocks-android/blob/master/.github/faq.md"</string>
 <string name="about">"关于"</string>
 <string name="about_title">"影梭 (Shadowsocks) %s"</string>
 <string name="edit">"编辑"</string>
@@ -87,12 +103,13 @@
 
 <!-- profile -->
 <string name="profile_config">"配置文件设置"</string>
+<string name="unsaved_changes_prompt">"保存修改吗？"</string>
+<string name="apply">"应用"</string>
 <string name="delete">"删除"</string>
 <string name="delete_confirm_prompt">"您确定要删除此配置文件？"</string>
 <string name="share_qr_nfc">"二维码 / NFC"</string>
 <string name="add_profile_dialog">"为影梭添加此配置文件？"</string>
 <string name="add_profile_methods_scan_qr_code">"扫描二维码"</string>
-<string name="add_profile_methods_manual_settings">"手动设置"</string>
 <plurals name="removed">
 <item quantity="other">"已删除 %d 项"</item>
 </plurals>
@@ -110,7 +127,6 @@
 <string name="received">"接收："</string>
 <string name="connecting">"连接中…"</string>
 <string name="vpn_connected">"已连接，点击测试连接"</string>
-<string name="nat_connected">"已连接"</string>
 <string name="not_connected">"未连接"</string>
 
 <!-- acl -->
@@ -123,7 +139,9 @@
 <string name="route_entry_bypass_chn">"绕过中国大陆地址"</string>
 <string name="route_entry_bypass_lan_chn">"绕过局域网及中国大陆地址"</string>
 <string name="route_entry_chinalist">"仅代理中国大陆地址"</string>
+
 <string name="proxied_apps_summary_v21">"为应用程序分别设置代理"</string>
+
 <string name="acl_rule_templates_generic">"URL/子网/域名 PCRE 正则表达式"</string>
 <string name="acl_rule_templates_domain">"域名及其子域名"</string>
 
@@ -138,5 +156,17 @@
 
 <!-- notification category -->
 <string name="service_vpn">"VPN 服务"</string>
-<string name="service_nat">"NAT 服务"</string>
-</resources>
\ No newline at end of file
+<string name="add_profile_methods_manual_settings">"手动设置"</string>
+<string name="advanced">"高级选项"</string>
+<string name="service_mode">"服务模式"</string>
+<string name="service_mode_proxy">"仅代理"</string>
+<string name="service_mode_vpn">"VPN"</string>
+<string name="service_mode_transproxy">"透明代理"</string>
+<string name="port_proxy">"SOCKS5 代理端口"</string>
+<string name="port_local_dns">"本地 DNS 端口"</string>
+<string name="port_transproxy">"透明代理端口"</string>
+<string name="service_proxy">"代理模式"</string>
+<string name="service_transproxy">"透明代理模式"</string>
+<string name="vpn_permission_denied">"创建 VPN 服务权限不足"</string>
+<string name="auto_connect_summary_v24">"允许 Shadowsocks 随系统启动，建议使用始终开启的 VPN"</string>
+</resources>
diff --git a/mobile/src/main/res/values-zh-rTW/strings.xml b/mobile/src/main/res/values-zh-rTW/strings.xml
index 9e523521..7adabe74 100644
--- a/mobile/src/main/res/values-zh-rTW/strings.xml
+++ b/mobile/src/main/res/values-zh-rTW/strings.xml
@@ -1,36 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+<string name="app_name">"影梭"</string>
 <string name="quick_toggle">"切換"</string>
 
 <!-- misc -->
 <string name="profile">"設定檔"</string>
 <string name="profile_summary">"切換至其他設定檔或新增新設定檔"</string>
-<string name="nat">"NAT 模式 (已過時)"</string>
-<string name="nat_summary">"使用 NAT 模式代替 VPN 模式，需要 ROOT 權限"</string>
 <string name="remote_dns">"遠程 DNS"</string>
 <string name="stat_summary">"傳送: \t%3$s\t↑\t%1$s/s
 接收: \t%4$s\t↓\t%2$s/s"</string>
+<string name="stat_profiles">"%1$s↑\t%2$s↓"</string>
+<string name="traffic_summary">"%1$s/s↑\t%2$s/s↓"</string>
+<plurals name="bytes">
+<item quantity="other">"位元组"</item>
+</plurals>
 <string name="connection_test_pending">"檢查連線能力"</string>
 <string name="connection_test_testing">"測試中……"</string>
 <string name="connection_test_available">"成功: %d 毫秒延遲"</string>
 <string name="connection_test_error">"偵測出網際網路連線失敗: %s"</string>
 <string name="connection_test_fail">"無法使用網際網路"</string>
-<string name="connection_test_error_status_code">"錯誤碼: #%d"</string>
+<string name="connection_test_error_status_code">"錯誤碼: （#%d）"</string>
+
+<!-- proxy category -->
+<string name="proxy_cat">"伺服器設定"</string>
 
 <!-- proxy category -->
 <string name="profile_name">"設定檔名稱"</string>
 <string name="proxy">"伺服器"</string>
 <string name="remote_port">"遠端連接埠"</string>
-<string name="port">"本機連接埠"</string>
 <string name="sitekey">"密碼"</string>
 <string name="enc_method">"加密方法"</string>
 
+<!-- feature category -->
+<string name="feature_cat">"功能設定"</string>
+
 <!-- feature category -->
 <string name="ipv6">"IPv6 路由"</string>
 <string name="ipv6_summary">"向遠端重新導向 IPv6 流量"</string>
 <string name="route_list">"路由"</string>
 <string name="route_entry_gfwlist">"GFW List"</string>
+
 <string name="proxied_apps">"個別應用程式的 Proxy"</string>
+
 <string name="proxied_apps_summary">"為已選擇的應用程式設定 Proxy，在 Android 4.X 以下需要開啟 NAT 模式"</string>
 <string name="on">"開"</string>
 <string name="bypass_apps">"略過模式"</string>
@@ -46,28 +57,28 @@
 <string name="forward_success">"Shadowsocks 已啟動。"</string>
 <string name="invalid_server">"伺服器名稱無效"</string>
 <string name="service_failed">"連線至遠端伺服器失敗"</string>
-<string name="nat_deprecated">"警告：自 Android 5.0 開始， NAT 模式已過時"</string>
-<string name="nat_no_root">"NAT 模式需要 ROOT 權限"</string>
-<string name="switch_to_vpn">"切換至 VPN 模式"</string>
 <string name="stop">"停止"</string>
 <string name="stopping">"關閉中…"</string>
 <string name="vpn_error">"%s"</string>
 <string name="reboot_required">"VPN 服務啟動失敗。您或許需要重新啟動您的裝置。"</string>
 <string name="profile_invalid_input">"未找到有效的設定檔資料。"</string>
 
+<!-- alert category -->
+<string name="yes">"是"</string>
+<string name="no">"否"</string>
+
 <!-- alert category -->
 <string name="close">"關閉"</string>
 <string name="profile_empty">"請選擇設定檔"</string>
 <string name="proxy_empty">"Proxy 或密碼不可以空白"</string>
 <string name="connect">"連線"</string>
-<string name="recovering">"重設中…"</string>
 <string name="remove_profile">"移除此設定檔 %s?"</string>
 
 <!-- menu category -->
 <string name="profiles">"設定檔"</string>
 <string name="settings">"設定"</string>
 <string name="faq">"常見問題"</string>
-<string name="recovery">"重設"</string>
+<string name="faq_url">"https://github.com/shadowsocks/shadowsocks-android/blob/master/.github/faq.md"</string>
 <string name="about">"關於"</string>
 <string name="about_title">"Shadowsocks %s"</string>
 <string name="edit">"編輯"</string>
@@ -83,12 +94,13 @@
 
 <!-- profile -->
 <string name="profile_config">"設定檔設定"</string>
+<string name="unsaved_changes_prompt">"要儲存變更嗎？"</string>
+<string name="apply">"套用"</string>
 <string name="delete">"刪除"</string>
 <string name="delete_confirm_prompt">"您確定要移除這個設定檔嗎？"</string>
 <string name="share_qr_nfc">"QR 碼 / NFC"</string>
 <string name="add_profile_dialog">"為 Shadowsocks 新增此設定檔？"</string>
 <string name="add_profile_methods_scan_qr_code">"掃描 QR 碼"</string>
-<string name="add_profile_methods_manual_settings">"手動設定"</string>
 <plurals name="removed">
 <item quantity="other">"已移除 %d 項"</item>
 </plurals>
@@ -106,7 +118,6 @@
 <string name="received">"接收:"</string>
 <string name="connecting">"連線中…"</string>
 <string name="vpn_connected">"已連線，輕觸以檢查連線能力"</string>
-<string name="nat_connected">"已連線"</string>
 <string name="not_connected">"未連線"</string>
 
 <!-- acl -->
@@ -119,13 +130,15 @@
 <string name="route_entry_bypass_chn">"略過中國大陸"</string>
 <string name="route_entry_bypass_lan_chn">"略過區域網路及中國大陸"</string>
 <string name="route_entry_chinalist">"China List"</string>
+
 <string name="proxied_apps_summary_v21">"為已選擇的應用程式設定 Proxy"</string>
+
 <string name="acl_rule_templates_generic">"URL/子網路/主機名稱 PCRE 模式"</string>
 <string name="acl_rule_templates_domain">"網域及其所有子網域"</string>
 
 <!-- plugin -->
 <string name="plugin">"外掛程式"</string>
-<string name="plugin_configure">"設定..."</string>
+<string name="plugin_configure">"設定…"</string>
 <string name="plugin_disabled">"停用"</string>
 <string name="plugin_unknown">"未知插件 %s"</string>
 <string name="plugin_untrusted">"警告：此外掛程式似乎不是來自一個已知的受信任來源。"</string>
@@ -134,5 +147,17 @@
 
 <!-- notification category -->
 <string name="service_vpn">"VPN 服務"</string>
-<string name="service_nat">"NAT 服務"</string>
-</resources>
\ No newline at end of file
+<string name="add_profile_methods_manual_settings">"手動設置"</string>
+<string name="advanced">"高級"</string>
+<string name="service_mode">"服務模式"</string>
+<string name="service_mode_proxy">"仅代理"</string>
+<string name="service_mode_vpn">"VPN"</string>
+<string name="service_mode_transproxy">"透明代理"</string>
+<string name="port_proxy">"SOCKS5 代理連接埠"</string>
+<string name="port_local_dns">"本地 DNS 連接埠"</string>
+<string name="port_transproxy">"透明代理連接埠"</string>
+<string name="service_proxy">"代理服務"</string>
+<string name="service_transproxy">"透明代理服務"</string>
+<string name="vpn_permission_denied">"没有權限創建 VPN 服務"</string>
+<string name="auto_connect_summary_v24">"允許 Shadowsocks 隨系統啟動，建議使用始終開啟的 VPN"</string>
+</resources>