From 284880b58623aa5319c758634ea4324462e37be4 Mon Sep 17 00:00:00 2001
From: Liu DongMiao <liudongmiao@gmail.com>
Date: Sun, 27 Jan 2019 19:00:49 +0800
Subject: [PATCH] sync to 3.6.1.5

---
 brevent/src/main/res/values-es/strings.xml     | 8 +++++---
 brevent/src/main/res/values-pl/strings.xml     | 8 +++++---
 brevent/src/main/res/values-pt-rBR/strings.xml | 8 +++++---
 brevent/src/main/res/values-zh-rCN/strings.xml | 8 +++++---
 brevent/src/main/res/values-zh-rTW/strings.xml | 6 ++++--
 brevent/src/main/res/values/strings.xml        | 8 +++++---
 6 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/brevent/src/main/res/values-es/strings.xml b/brevent/src/main/res/values-es/strings.xml
index d1ca455e..a668dca5 100644
--- a/brevent/src/main/res/values-es/strings.xml
+++ b/brevent/src/main/res/values-es/strings.xml
@@ -29,8 +29,9 @@
     <string name="brevent_service_start">Por favor, inicie servidor Brevent (%s)</string>
     <string name="brevent_service_no_response">El servidor Brevent no responde (%s)</string>
     <string name="brevent_service_guide">1.Activar \"Opciones de desarrollo\", habilitar \"Depuración por USB\", actualmente:%1$s.\n\n2. Conectar al PC vía USB. %2$s.\n\n3. Ejecutar en línea de comandos en el PC \"adb devices\", asegúrese que el PC pueda reconocer el dispositivo (Leer \"Guía - ADB\").\n\n4. Ejecutar en línea de comandos del PC \"%3$s\".</string>
-    <string name="brevent_service_guide_root">It seems your devices is rooted. You can turn on network ADB manually, or try tap \"Root\" button in Brevent.\n\nRoot is unnecessary for Brevent, and no support without detail logs.</string>
-    <string name="brevent_service_guide_root_14">It seems your devices is rooted. You can turn on network ADB manually, or try tap \"Root\" button in Brevent.\n\nRoot is unnecessary for Brevent, and no support without detail logs.\n\nIf you don\'t see \"Root\", tap \"Back\" 14 times, then pay 3 Brefoil.</string>
+    <string name="brevent_service_guide_root">It seems your devices is rooted. You can turn on network ADB manually, or try tap \"Root\" button in Brevent.\n\nRoot is unnecessary for Brevent, and requires payment.</string>
+    <string name="brevent_service_guide_root_14">It seems your devices is rooted. You can turn on network ADB manually, or try tap \"Root\" button in Brevent.\n\nRoot is unnecessary for Brevent, and requires payment.\n\nIf you don\'t see \"Root\", uninstall and install again, then pay 3 Brefoil.</string>
+    <string name="brevent_service_payment_root">Root is unnecessary for Brevent, and requires payment.</string>
     <string name="brevent_service_open_development">Desarrollo</string>
     <string name="brevent_service_copy_path">Copiar comando</string>
     <string name="brevent_service_command_copied">Comando copiado: %s</string>
@@ -62,9 +63,11 @@
     <string name="process_stats">(última vez: %1$s, total: %2$s)</string>
     <string name="process_all_top" tools:ignore="PluralsCandidate">%d principal</string>
     <string name="process_all_service" tools:ignore="PluralsCandidate">%d en uso</string>
+    <string name="process_all_service_cached" tools:ignore="PluralsCandidate">%d cached service</string>
     <string name="process_all_cached" tools:ignore="PluralsCandidate">%d cached</string>
     <string name="process_all_total">%d</string>
     <string name="process_service" tools:ignore="PluralsCandidate">%d en servicio</string>
+    <string name="process_service_cached" tools:ignore="PluralsCandidate">%d cached service</string>
     <string name="process_total">total %d</string>
     <plurals name="process_process">
         <item quantity="one">&#160;en proceso</item>
@@ -274,7 +277,6 @@
     <string name="make_brevent_safer">Be careful to brevent system apps, or pay %1$s to dismiss safe warning.</string>
     <string name="pay_brevent_require">Require to pay %s</string>
     <string name="pay_now">Pay now</string>
-    <string name="pay_lucky">Lucky</string>
 
     <string name="brevented_app">Brevented \"%1$s\"</string>
     <string name="brevented_app_pay">Pay to brevent more apps.</string>
diff --git a/brevent/src/main/res/values-pl/strings.xml b/brevent/src/main/res/values-pl/strings.xml
index 7d94005a..ae50ac78 100644
--- a/brevent/src/main/res/values-pl/strings.xml
+++ b/brevent/src/main/res/values-pl/strings.xml
@@ -29,8 +29,9 @@
     <string name="brevent_service_start">Proszę uruchomić serwer Brevent (%s)</string>
     <string name="brevent_service_no_response">Serwer Brevent nie odpowiada (%s)</string>
     <string name="brevent_service_guide">1. Włącz \"Opcje programistyczne\" oraz aktywuj funkcję \"Debugowanie USB\" %1$s\n\n2. Podłącz swój telefon do komputera za pomocą kabla USB %2$s\n\n3. Wykonaj w wierszu poleceń komendę \"adb devices\" i upewnij się, że Twój komputer rozpoznaje urządzenie (Przeczytaj: \"Poradnik - ADB\")\n\n4. Wykonaj w wierszu poleceń \"%3$s\"</string>
-    <string name="brevent_service_guide_root">It seems your devices is rooted. You can turn on network ADB manually, or try tap \"Root\" button in Brevent.\n\nRoot is unnecessary for Brevent, and no support without detail logs.</string>
-    <string name="brevent_service_guide_root_14">It seems your devices is rooted. You can turn on network ADB manually, or try tap \"Root\" button in Brevent.\n\nRoot is unnecessary for Brevent, and no support without detail logs.\n\nIf you don\'t see \"Root\", tap \"Back\" 14 times, then pay 3 Brefoil.</string>
+    <string name="brevent_service_guide_root">It seems your devices is rooted. You can turn on network ADB manually, or try tap \"Root\" button in Brevent.\n\nRoot is unnecessary for Brevent, and requires payment.</string>
+    <string name="brevent_service_guide_root_14">It seems your devices is rooted. You can turn on network ADB manually, or try tap \"Root\" button in Brevent.\n\nRoot is unnecessary for Brevent, and requires payment.\n\nIf you don\'t see \"Root\", uninstall and install again, then pay 3 Brefoil.</string>
+    <string name="brevent_service_payment_root">Root is unnecessary for Brevent, and requires payment.</string>
     <string name="brevent_service_open_development">Opcje programistyczne</string>
     <string name="brevent_service_copy_path">Kopiuj polecenie</string>
     <string name="brevent_service_command_copied">Polecenie zostało skopiowane: %s</string>
@@ -62,9 +63,11 @@
     <string name="process_stats">(ostatnio: %1$s, ogółem: %2$s)</string>
     <string name="process_all_top" tools:ignore="PluralsCandidate">%d główny(ch)</string>
     <string name="process_all_service" tools:ignore="PluralsCandidate">%d usług(i)</string>
+    <string name="process_all_service_cached" tools:ignore="PluralsCandidate">%d cached service</string>
     <string name="process_all_cached" tools:ignore="PluralsCandidate">%d cached</string>
     <string name="process_all_total">%d</string>
     <string name="process_service" tools:ignore="PluralsCandidate">%d usługa</string>
+    <string name="process_service_cached" tools:ignore="PluralsCandidate">%d cached service</string>
     <string name="process_total">ogółem %d</string>
     <plurals name="process_process">
         <item quantity="one">&#160;procesu</item>
@@ -274,7 +277,6 @@
     <string name="make_brevent_safer">Be careful to brevent system apps, or pay %1$s to dismiss safe warning.</string>
     <string name="pay_brevent_require">Require to pay %s</string>
     <string name="pay_now">Pay now</string>
-    <string name="pay_lucky">Lucky</string>
 
     <string name="brevented_app">Brevented \"%1$s\"</string>
     <string name="brevented_app_pay">Pay to brevent more apps.</string>
diff --git a/brevent/src/main/res/values-pt-rBR/strings.xml b/brevent/src/main/res/values-pt-rBR/strings.xml
index 5c827871..cd42765b 100644
--- a/brevent/src/main/res/values-pt-rBR/strings.xml
+++ b/brevent/src/main/res/values-pt-rBR/strings.xml
@@ -29,8 +29,9 @@
     <string name="brevent_service_start">Inicie o servidor Brevent (%s)</string>
     <string name="brevent_service_no_response">O servidor Brevent não responde (%s)</string>
     <string name="brevent_service_guide">1. Ligue as \"Opções do desenvolvedor\", ative a \"Depuração USB\" %1$s\n\n2. Conecte-se ao PC via USB %2$s\n\n3. Execute na linha de comando do PC \"adb devices\", certifique-se de que o PC pode reconhecer o dispositivo (Consultar \"Guia - ADB\")\n\n4. Execute na linha de comando do PC \"%3$s\"</string>
-    <string name="brevent_service_guide_root">It seems your devices is rooted. You can turn on network ADB manually, or try tap \"Root\" button in Brevent.\n\nRoot is unnecessary for Brevent, and no support without detail logs.</string>
-    <string name="brevent_service_guide_root_14">It seems your devices is rooted. You can turn on network ADB manually, or try tap \"Root\" button in Brevent.\n\nRoot is unnecessary for Brevent, and no support without detail logs.\n\nIf you don\'t see \"Root\", tap \"Back\" 14 times, then pay 3 Brefoil.</string>
+    <string name="brevent_service_guide_root">It seems your devices is rooted. You can turn on network ADB manually, or try tap \"Root\" button in Brevent.\n\nRoot is unnecessary for Brevent, and requires payment.</string>
+    <string name="brevent_service_guide_root_14">It seems your devices is rooted. You can turn on network ADB manually, or try tap \"Root\" button in Brevent.\n\nRoot is unnecessary for Brevent, and requires payment.\n\nIf you don\'t see \"Root\", uninstall and install again, then pay 3 Brefoil.</string>
+    <string name="brevent_service_payment_root">Root is unnecessary for Brevent, and requires payment.</string>
     <string name="brevent_service_open_development">Desenvolvedor</string>
     <string name="brevent_service_copy_path">Copiar comando</string>
     <string name="brevent_service_command_copied">Comando copiado: %s</string>
@@ -62,9 +63,11 @@
     <string name="process_stats">(último: %1$s, total: %2$s)</string>
     <string name="process_all_top" tools:ignore="PluralsCandidate">%d principal</string>
     <string name="process_all_service" tools:ignore="PluralsCandidate">%d serviço</string>
+    <string name="process_all_service_cached" tools:ignore="PluralsCandidate">%d cached service</string>
     <string name="process_all_cached" tools:ignore="PluralsCandidate">%d no cache</string>
     <string name="process_all_total">%d</string>
     <string name="process_service" tools:ignore="PluralsCandidate">%d serviço</string>
+    <string name="process_service_cached" tools:ignore="PluralsCandidate">%d cached service</string>
     <string name="process_total">total %d</string>
     <plurals name="process_process">
         <item quantity="one">&#160;processo</item>
@@ -274,7 +277,6 @@
     <string name="make_brevent_safer">Be careful to brevent system apps, or pay %1$s to dismiss safe warning.</string>
     <string name="pay_brevent_require">Require to pay %s</string>
     <string name="pay_now">Pay now</string>
-    <string name="pay_lucky">Lucky</string>
 
     <string name="brevented_app">Brevenido \"%1$s\"</string>
     <string name="brevented_app_pay">Pay to brevent more apps.</string>
diff --git a/brevent/src/main/res/values-zh-rCN/strings.xml b/brevent/src/main/res/values-zh-rCN/strings.xml
index f3316a4b..f23ec785 100644
--- a/brevent/src/main/res/values-zh-rCN/strings.xml
+++ b/brevent/src/main/res/values-zh-rCN/strings.xml
@@ -28,8 +28,9 @@
     <string name="brevent_service_start">请启动黑阈服务（%s）</string>
     <string name="brevent_service_no_response">黑阈服务没有响应（%s）</string>
     <string name="brevent_service_guide">1. 打开“开发者选项”，启用“USB调试”%1$s\n\n2. 使用 USB 连接到电脑%2$s\n\n3. 在电脑命令行中执行“adb devices”，确认可以找到手机（“adb”可能需要调整，请参考“向导 - ADB”或中文图文 PDF 版文档）\n\n4. 在命令行中执行“%3$s”</string>
-    <string name="brevent_service_guide_root">您的设备看起来已 Root。您可自行开启网络调试，或者直接点按 Root。\n\n黑阈不需要也不提倡 Root，仅对 Root 提供有限技术支持。\n\n如果无法开机自启，请自查任何系统限制。</string>
-    <string name="brevent_service_guide_root_14">您的设备看起来已 Root。您可自行开启网络调试，或者直接点按 Root。\n\n黑阈不需要也不提倡 Root，仅对 Root 提供有限技术支持。\n\n如果无法开机自启，请自查任何系统限制。\n\n如果您没有见到 Root 按钮，请按 14 次 Back，然后支付 3 二向箔。</string>
+    <string name="brevent_service_guide_root">您的设备看起来已 Root。您可自行开启网络调试，或者直接点按 Root。\n\n黑阈不需要也不提倡 Root，并且需要支付。\n\n如果无法开机自启，请自查任何系统限制。</string>
+    <string name="brevent_service_guide_root_14">您的设备看起来已 Root。您可自行开启网络调试，或者直接点按 Root。\n\n黑阈不需要也不提倡 Root，并且需要支付。\n\n如果无法开机自启，请自查任何系统限制。\n\n如果您没有见到 Root 按钮，卸载重装，然后支付 3 二向箔。</string>
+    <string name="brevent_service_payment_root">黑阈不需要也不提倡 Root，并且需要支付。</string>
     <string name="brevent_service_open_development">开发者选项</string>
     <string name="brevent_service_copy_path">复制指令</string>
     <string name="brevent_service_command_copied">指令已复制：%s</string>
@@ -61,9 +62,11 @@
     <string name="process_stats">（至 %1$s 共 %2$s）</string>
     <string name="process_all_top">%d 个前台</string>
     <string name="process_all_service">%d 个服务</string>
+    <string name="process_all_service_cached">%d 个缓存服务</string>
     <string name="process_all_cached">%d 个缓存</string>
     <string name="process_all_total">%d 个</string>
     <string name="process_service">%d 个服务</string>
+    <string name="process_service_cached">%d 个缓存服务</string>
     <string name="process_total">共 %d 个</string>
     <plurals name="process_process">
         <item quantity="other">进程</item>
@@ -272,7 +275,6 @@
     <string name="make_brevent_safer">请谨慎黑阈系统应用，或者支付 %1$s关闭安全提示。</string>
     <string name="pay_brevent_require">需要支付 %s</string>
     <string name="pay_now">现在支付</string>
-    <string name="pay_lucky">试试手气</string>
 
     <string name="brevented_app">已黑阈“%1$s”</string>
     <string name="brevented_app_pay">支付以黑阈更多应用。</string>
diff --git a/brevent/src/main/res/values-zh-rTW/strings.xml b/brevent/src/main/res/values-zh-rTW/strings.xml
index 6f6b7332..ca6e2ee8 100644
--- a/brevent/src/main/res/values-zh-rTW/strings.xml
+++ b/brevent/src/main/res/values-zh-rTW/strings.xml
@@ -29,7 +29,8 @@
     <string name="brevent_service_no_response">黑閾服務沒有回應（%s）</string>
     <string name="brevent_service_guide">1. 開啟「開發人員選項」，啟用「USB 偵錯」%1$s\n\n2. 使用 USB 連線到電腦%2$s\n\n3. 在電腦的命令提示字元中執行「adb devices」，確認可以找到手機（請參考「指引 - ADB」）\n\n4. 在命令提示字元中執行「%3$s」</string>
     <string name="brevent_service_guide_root">您的設備看起來已 Root。您可自行開啟網絡調試，或者直接點按 Root。\n\n黑閾不需要也不提倡 Root，僅對 Root 提供有限技術支持。</string>
-    <string name="brevent_service_guide_root_14">您的設備看起來已 Root。您可自行開啟網絡調試，或者直接點按 Root。\n\n黑閾不需要也不提倡 Root，僅對 Root 提供有限技術支持。\n\n如果您沒有見到 Root 按鈕，請按 14 次 Back，然後支付 3 二向箔。</string>
+    <string name="brevent_service_guide_root_14">您的設備看起來已 Root。您可自行開啟網絡調試，或者直接點按 Root。\n\n黑閾不需要也不提倡 Root，僅對 Root 提供有限技術支持。\n\n如果您沒有見到 Root 按鈕，卸載重裝，然後支付 3 二向箔。</string>
+    <string name="brevent_service_payment_root">黑閾不需要也不提倡 Root，但 Root 功能耗费大量时间精力，因为需要付费。</string>
     <string name="brevent_service_open_development">開發人員選項</string>
     <string name="brevent_service_copy_path">複製指令</string>
     <string name="brevent_service_command_copied">指令已複製: %s</string>
@@ -61,9 +62,11 @@
     <string name="process_stats">（至 %1$s 共 %2$s）</string>
     <string name="process_all_top">%d 個前景</string>
     <string name="process_all_service">%d 個服務</string>
+    <string name="process_all_service_cached">%d 個快取服務</string>
     <string name="process_all_cached">%d 個快取</string>
     <string name="process_all_total">%d 個</string>
     <string name="process_service">%d 個服務</string>
+    <string name="process_service_cached">%d 個快取服務</string>
     <string name="process_total">共 %d 個</string>
     <plurals name="process_process">
         <item quantity="other">程序</item>
@@ -272,7 +275,6 @@
     <string name="make_brevent_safer">請謹慎黑閾系統應用程式，或者支付 %1$s 關閉安全提示。</string>
     <string name="pay_brevent_require">需要支付 %s</string>
     <string name="pay_now">現在支付</string>
-    <string name="pay_lucky">試試手氣</string>
 
     <string name="brevented_app">已黑閾「%1$s」</string>
     <string name="brevented_app_pay">支付以黑閾更多應用程式。</string>
diff --git a/brevent/src/main/res/values/strings.xml b/brevent/src/main/res/values/strings.xml
index 98a2c409..532bfd7b 100644
--- a/brevent/src/main/res/values/strings.xml
+++ b/brevent/src/main/res/values/strings.xml
@@ -29,8 +29,9 @@
     <string name="brevent_service_start">Please start Brevent server (%s)</string>
     <string name="brevent_service_no_response">Brevent server don\'t response (%s)</string>
     <string name="brevent_service_guide">1. Turn on \"Developer options\", enable \"USB debugging\" %1$s\n\n2. Connect to PC via USB %2$s\n\n3. Execute in PC\'s command line \"adb devices\", make sure PC can recognize device (Reader \"Guide - ADB\")\n\n4. Execute in PC\'s command line \"%3$s\"</string>
-    <string name="brevent_service_guide_root">It seems your devices is rooted. You can turn on network ADB manually, or try tap \"Root\" button in Brevent.\n\nRoot is unnecessary for Brevent, and no support without detail logs.</string>
-    <string name="brevent_service_guide_root_14">It seems your devices is rooted. You can turn on network ADB manually, or try tap \"Root\" button in Brevent.\n\nRoot is unnecessary for Brevent, and no support without detail logs.\n\nIf you don\'t see \"Root\", tap \"Back\" 14 times, then pay 3 Brefoil.</string>
+    <string name="brevent_service_guide_root">It seems your devices is rooted. You can turn on network ADB manually, or try tap \"Root\" button in Brevent.\n\nRoot is unnecessary for Brevent, and requires payment.</string>
+    <string name="brevent_service_guide_root_14">It seems your devices is rooted. You can turn on network ADB manually, or try tap \"Root\" button in Brevent.\n\nRoot is unnecessary for Brevent, and requires payment.\n\nIf you don\'t see \"Root\", uninstall and install again, then pay 3 Brefoil.</string>
+    <string name="brevent_service_payment_root">Root is unnecessary for Brevent, and requires payment.</string>
     <string name="brevent_service_open_development">Developer</string>
     <string name="brevent_service_copy_path">Copy command</string>
     <string name="brevent_service_command_copied">Command copied: %s</string>
@@ -62,9 +63,11 @@
     <string name="process_stats">(last: %1$s, total: %2$s)</string>
     <string name="process_all_top" tools:ignore="PluralsCandidate">%d top</string>
     <string name="process_all_service" tools:ignore="PluralsCandidate">%d service</string>
+    <string name="process_all_service_cached" tools:ignore="PluralsCandidate">%d cached service</string>
     <string name="process_all_cached" tools:ignore="PluralsCandidate">%d cached</string>
     <string name="process_all_total">%d</string>
     <string name="process_service" tools:ignore="PluralsCandidate">%d service</string>
+    <string name="process_service_cached" tools:ignore="PluralsCandidate">%d cached service</string>
     <string name="process_total">total %d</string>
     <plurals name="process_process">
         <item quantity="one">&#160;process</item>
@@ -274,7 +277,6 @@
     <string name="make_brevent_safer">Be careful to brevent system apps, or pay %1$s to dismiss safe warning.</string>
     <string name="pay_brevent_require">Require to pay %s</string>
     <string name="pay_now">Pay now</string>
-    <string name="pay_lucky">Lucky</string>
 
     <string name="brevented_app">Brevented \"%1$s\"</string>
     <string name="brevented_app_pay">Pay to brevent more apps.</string>