Merge pull request #1618 from zhaoguomanong/master

Fix app crashing during updating subscribe & translation error

V2rayNG/app/src/main/kotlin/com/v2ray/ang/viewmodel/MainViewModel.kt

@@ -54,12 +54,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
 
     fun reloadServerList() {
         serverList = MmkvManager.decodeServerList()
-        viewModelScope.launch(Dispatchers.Default) {
-            updateCache()
-            launch(Dispatchers.Main) {
-                updateListAction.value = -1
-            }
-        }
+        updateCache()
+        updateListAction.value = -1
     }
 
     fun removeServer(guid: String) {

V2rayNG/app/src/main/res/values-zh-rTW/strings.xml

@@ -31,7 +31,7 @@
     <string name="menu_item_import_config_manually_trojan">手動鍵入 [Trojan]</string>
     <string name="menu_item_import_config_custom">自訂組態</string>
     <string name="menu_item_import_config_custom_clipboard">從剪貼簿匯入自訂組態</string>
-    <string name="menu_item_import_config_custom_local">從 URL 匯入自訂組態</string>
+    <string name="menu_item_import_config_custom_local">從本地匯入自訂組態</string>
     <string name="menu_item_import_config_custom_url">從 URL 匯入自訂組態</string>
     <string name="menu_item_import_config_custom_url_scan">掃描 URL 匯入自訂組態</string>
     <string name="del_config_comfirm">確定刪除？</string>