From 0f378015e0868ed27b90f9ce64a08f28ad5eb006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@nekox.me>
Date: Mon, 18 May 2020 10:39:17 +0800
Subject: [PATCH] New Crowdin translations (#80)

* New translations strings_nekox.xml (Portuguese, Brazilian)

* New translations strings_nekox.xml (Chinese Simplified)
---
 TMessagesProj/src/main/res/values-pt-rBR/strings_nekox.xml | 2 --
 TMessagesProj/src/main/res/values-zh-rCN/strings_nekox.xml | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/TMessagesProj/src/main/res/values-pt-rBR/strings_nekox.xml b/TMessagesProj/src/main/res/values-pt-rBR/strings_nekox.xml
index 35e332cba..929308de6 100644
--- a/TMessagesProj/src/main/res/values-pt-rBR/strings_nekox.xml
+++ b/TMessagesProj/src/main/res/values-pt-rBR/strings_nekox.xml
@@ -121,8 +121,6 @@
     <string name="ProxyInfoSSR">Configurações do proxy ShadowsocksR</string>
     <string name="SSRProtocol">Protocolo</string>
     <string name="SSRProtocolParams">Parâmetros de protocolo</string>
-    <string name="SSRObfs">Obfs</string>
-    <string name="SSRObfsParam">Obfs Param</string>
     <string name="ProxyRemarks">Observações</string>
     <string name="RetestPing">Teste novamente o ping para todos os servidores</string>
     <string name="ReorderByPing">Reordenar servidores por ping</string>
diff --git a/TMessagesProj/src/main/res/values-zh-rCN/strings_nekox.xml b/TMessagesProj/src/main/res/values-zh-rCN/strings_nekox.xml
index 274e48fe3..91dbb2122 100644
--- a/TMessagesProj/src/main/res/values-zh-rCN/strings_nekox.xml
+++ b/TMessagesProj/src/main/res/values-zh-rCN/strings_nekox.xml
@@ -101,6 +101,7 @@
     <string name="AddProxyVmess">添加 Vmess 代理</string>
     <string name="AddProxySS">添加 Shadowsocks 代理</string>
     <string name="AddProxySSR">添加 ShadowsocksR 代理</string>
+    <string name="SSPluginConflictingName">多个插件使用此ID： %s ，直到您卸载冲突插件，他们均不可用。</string>
     <string name="EditProxy">编辑代理</string>
     <string name="ShareProxy">分享代理</string>
     <string name="ProxyDelete">删除代理</string>