From 7173032477c5e62e820b03b57d2dc5b9ef16e5ef Mon Sep 17 00:00:00 2001
From: Florian Mayer <fmayer@google.com>
Date: Mon, 5 Dec 2022 19:36:00 +0000
Subject: [PATCH] [MTE] remove translatable=false from strings

No concerns were raised by Settings UX.

Bug: 258550150
Bug: 245624194
Change-Id: Ie58c97108781c94e5a0cd086acca5b21b6ea105f
---
 res/values/strings.xml | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b24bcc6f758..544ba0e3492 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -8034,39 +8034,38 @@
     <!-- [CHAR LIMIT=NONE] eSim deletion confirmation description  -->
     <string name="confirm_sim_deletion_description">Verify it\u0027s you before erasing a eSIM</string>
 
-    <!-- TODO(b/258550150): Finalize all strings in this section and remove translatable="false" -->
     <!-- [CHAR LIMIT=32] Name of Advanced memory protection page in "More Security Settings" and heading of page. -->
-    <string name="memtag_title" translatable="false">Advanced memory protection beta</string>
+    <string name="memtag_title">Advanced memory protection beta</string>
     <!-- [CHAR LIMIT=52] Label for button to turn on / off Advanced memory protection.-->
-    <string name="memtag_toggle" translatable="false">Advanced memory protection</string>
+    <string name="memtag_toggle">Advanced memory protection</string>
     <!-- [CHAR LIMIT=NONE] Subtitle of Advanced memory protection page. -->
-    <string name="memtag_intro" translatable="false">This beta feature helps you protect your device from bugs that may put your security at risk.</string>
+    <string name="memtag_intro">This beta feature helps you protect your device from bugs that may put your security at risk.</string>
     <!-- [CHAR LIMIT=NONE] Status label indicating that Advanced memory protection is on. -->
-    <string name="memtag_on" translatable="false">On</string>
+    <string name="memtag_on">On</string>
     <!-- [CHAR LIMIT=37] Status label indicating that Advanced memory protection is off. -->
-    <string name="memtag_off" translatable="false">Off</string>
+    <string name="memtag_off">Off</string>
     <!-- [CHAR LIMIT=37] Status label indicating that system needs to be rebooted for Advanced memory protection to be on. -->
-    <string name="memtag_on_pending" translatable="false">On after restart</string>
+    <string name="memtag_on_pending">On after restart</string>
     <!-- [CHAR LIMIT=37] Status label indicating that system needs to be rebooted for Advanced memory protection to be off. -->
-    <string name="memtag_off_pending" translatable="false">Off after restart</string>
+    <string name="memtag_off_pending">Off after restart</string>
     <!-- [CHAR LIMIT=37] Status label indicating that Advanced memory protection was forced off via remote device configuration. -->
-    <string name="memtag_force_off" translatable="false">Currently unavailable for your device</string>
+    <string name="memtag_force_off">Currently unavailable for your device</string>
     <!-- [CHAR LIMIT=37] Status label indicating that Advanced memory protection was forced on via remote device configuration. -->
-    <string name="memtag_force_on" translatable="false">Always on for your device</string>
+    <string name="memtag_force_on">Always on for your device</string>
     <!-- [CHAR LIMIT=NONE] Subtext on page to control Advanced memory protection settings. -->
-    <string name="memtag_footer" translatable="false">You\u0027ll have to restart your device to turn Advanced memory protection on or off. When it\u0027s on, you may notice slower device performance.</string>
+    <string name="memtag_footer">You\u0027ll have to restart your device to turn Advanced memory protection on or off. When it\u0027s on, you may notice slower device performance.</string>
     <!-- [CHAR LIMIT=31] Header of dialog asking user to reboot device. -->
-    <string name="memtag_reboot_title" translatable="false">Restart device?</string>
+    <string name="memtag_reboot_title">Restart device?</string>
     <!-- [CHAR LIMIT=NONE] Message shown in dialog prompting user to reboot device to turn on Advanced memory protection.-->
-    <string name="memtag_reboot_message_on" translatable="false">You\u0027ll need to restart your device to turn on Advanced memory protection.</string>
+    <string name="memtag_reboot_message_on">You\u0027ll need to restart your device to turn on Advanced memory protection.</string>
     <!-- [CHAR LIMIT=NONE] Message shown in dialog prompting user to reboot device to turn off Advanced memory protection.-->
-    <string name="memtag_reboot_message_off" translatable="false">You\u0027ll need to restart your device to turn off Advanced memory protection.</string>
+    <string name="memtag_reboot_message_off">You\u0027ll need to restart your device to turn off Advanced memory protection.</string>
     <!-- [CHAR LIMIT=17] Button label in dialog prompting user to reboot device.-->
-    <string name="memtag_reboot_yes" translatable="false">Restart</string>
+    <string name="memtag_reboot_yes">Restart</string>
     <!-- [CHAR LIMIT=17] Button label in dialog prompting user to reboot device.-->
-    <string name="memtag_reboot_no" translatable="false">Not now</string>
+    <string name="memtag_reboot_no">Not now</string>
     <!-- [CHAR LIMIT=NONE] Label for Learn More link. -->
-    <string name="memtag_learn_more" translatable="false">Learn more about Advanced memory protection.</string>
+    <string name="memtag_learn_more">Learn more about Advanced memory protection.</string>
 
     <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
     <string name="opening_paragraph_delete_profile_unknown_company">This work profile is managed by:</string>