summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2021-07-15 19:00:41 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-07-15 19:00:41 +0000
commit0d57ba415a12b294d998b0bae16af56f9c43348f (patch)
tree9058017b1409174474488cc331ee649e30159ebf
parentd7d85eb14376275bed840a890fb5f5eb0de08c28 (diff)
parentb81c6e87c281db7874e4986402328d51b464fbee (diff)
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
-rw-r--r--packages/SettingsLib/res/values-zh-rCN/arrays.xml4
-rw-r--r--packages/SettingsLib/res/values-zh-rCN/strings.xml2
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/SettingsLib/res/values-zh-rCN/arrays.xml b/packages/SettingsLib/res/values-zh-rCN/arrays.xml
index 970efa67e075..400973b4e095 100644
--- a/packages/SettingsLib/res/values-zh-rCN/arrays.xml
+++ b/packages/SettingsLib/res/values-zh-rCN/arrays.xml
@@ -170,7 +170,7 @@
<item msgid="3691785423374588514">"1M"</item>
</string-array>
<string-array name="select_logd_size_summaries">
- <item msgid="409235464399258501">"关闭"</item>
+ <item msgid="409235464399258501">"已关闭"</item>
<item msgid="4195153527464162486">"每个日志缓冲区 64K"</item>
<item msgid="7464037639415220106">"每个日志缓冲区 256K"</item>
<item msgid="8539423820514360724">"每个日志缓冲区 1M"</item>
@@ -184,7 +184,7 @@
<item msgid="7300881231043255746">"仅限内核"</item>
</string-array>
<string-array name="select_logpersist_summaries">
- <item msgid="97587758561106269">"关闭"</item>
+ <item msgid="97587758561106269">"已关闭"</item>
<item msgid="7126170197336963369">"所有日志缓冲区"</item>
<item msgid="7167543126036181392">"所有非无线电日志缓冲区"</item>
<item msgid="5135340178556563979">"仅限内核日志缓冲区"</item>
diff --git a/packages/SettingsLib/res/values-zh-rCN/strings.xml b/packages/SettingsLib/res/values-zh-rCN/strings.xml
index ac49b9913c44..e9914510debd 100644
--- a/packages/SettingsLib/res/values-zh-rCN/strings.xml
+++ b/packages/SettingsLib/res/values-zh-rCN/strings.xml
@@ -276,7 +276,7 @@
<string name="bluetooth_select_a2dp_codec_streaming_label" msgid="2040810756832027227">"正在流式传输:<xliff:g id="STREAMING_PARAMETER">%1$s</xliff:g>"</string>
<string name="select_private_dns_configuration_title" msgid="7887550926056143018">"私人 DNS"</string>
<string name="select_private_dns_configuration_dialog_title" msgid="3731422918335951912">"选择私人 DNS 模式"</string>
- <string name="private_dns_mode_off" msgid="7065962499349997041">"关闭"</string>
+ <string name="private_dns_mode_off" msgid="7065962499349997041">"已关闭"</string>
<string name="private_dns_mode_opportunistic" msgid="1947864819060442354">"自动"</string>
<string name="private_dns_mode_provider" msgid="3619040641762557028">"私人 DNS 提供商主机名"</string>
<string name="private_dns_mode_provider_hostname_hint" msgid="6564868953748514595">"输入 DNS 提供商的主机名"</string>