diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9c0c30d..96d7c60 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1540,7 +1540,7 @@
     <string name="widget_picker_title">Choose widget</string>
 
     <!-- Used to display "Details for UID 1234" in BatteryHistory -->
-    <string name="battery_history_details_for">Details for UID %d</string>
+    <string name="battery_history_details_for">Details for UID <xliff:g id="number" example="1234">%d</xliff:g></string>
 
     <!-- Used to name a set of apps that share a user id in BatteryHistory -->
     <string name="battery_history_uid">UID <xliff:g id="user_id">%1$d</xliff:g></string>
@@ -1689,7 +1689,7 @@
     <string name="bluetooth_on_time">WiFi on time</string>
     <!-- Application name and battery usage percentage -->
     <string name="usage_name_percent"><xliff:g id="name">%1$s</xliff:g>" - "
-            <xliff:g id="percent">%2$s</xliff:g>"%%"</string>
+            <xliff:g id="number" example="30">%2$s</xliff:g><xliff:g id="percent" example="%">%%</xliff:g></string>
 
     <!-- Activity title for battery usage details for an app. or power consumer -->
     <string name="details_title">Battery use details</string>
@@ -1845,7 +1845,7 @@
     <string name="vpn_settings_activity_title">VPN settings</string>
 
     <!-- Title of VPN connect dialog -->
-    <string name="vpn_connect_to">Connect to %s</string>
+    <string name="vpn_connect_to">Connect to <xliff:g id="name" example="Work Network">%s</xliff:g></string>
     <!-- In VPN connect dialog, for inputing username and password -->
     <string name="vpn_username_colon">Username:</string>
     <string name="vpn_password_colon">Password:</string>
@@ -1870,9 +1870,9 @@
     <string name="vpn_menu_delete">Delete network</string>
 
     <!-- VPN error dialog messages -->
-    <string name="vpn_error_miss_entering">You must enter %s.</string>
-    <string name="vpn_error_miss_selecting">You must select %s.</string>
-    <string name="vpn_error_duplicate_name">The VPN name \'%s\' already exists. Find another name.</string>
+    <string name="vpn_error_miss_entering">You must enter <xliff:g id="code">%s</xliff:g>.</string>
+    <string name="vpn_error_miss_selecting">You must select <xliff:g id="option">%s</xliff:g>.</string>
+    <string name="vpn_error_duplicate_name">The VPN name \'<xliff:g id="name" example="Home Network">%s</xliff:g>\' already exists. Find another name.</string>
     <string name="vpn_confirm_profile_deletion">Are you sure you want to delete this VPN?</string>
     <string name="vpn_confirm_add_profile_cancellation">Are you sure you don\'t want to create this profile?</string>
     <string name="vpn_confirm_edit_profile_cancellation">Are you sure you want to discard the changes made to this profile?</string>
@@ -1891,9 +1891,9 @@
     <!-- "Add VPN" preference title -->
     <string name="vpn_add_new_vpn">Add VPN</string>
     <!-- VPN profile editor title when adding a new profile -->
-    <string name="vpn_edit_title_add">Add %s VPN</string>
+    <string name="vpn_edit_title_add">Add <xliff:g id="name">%s</xliff:g> VPN</string>
     <!-- VPN profile editor title when editing an existing profile -->
-    <string name="vpn_edit_title_edit">%s details</string>
+    <string name="vpn_edit_title_edit"><xliff:g id="name">%s</xliff:g> details</string>
     <!-- Preference group title for a list of VPN profiles -->
     <string name="vpns">VPNs</string>
     <!-- Preference summary text when VPN is connecting -->
@@ -1910,9 +1910,9 @@
     <string name="vpn_a_name">a VPN name</string>
 
     <!-- Toast message shown when a profile is added -->
-    <string name="vpn_profile_added">\'%s\' is added</string>
+    <string name="vpn_profile_added">\'<xliff:g id="name">%s</xliff:g>\' is added</string>
     <!-- Toast message shown when changes of a profile is saved -->
-    <string name="vpn_profile_replaced">Changes are made to \'%s\'</string>
+    <string name="vpn_profile_replaced">Changes are made to \'<xliff:g id="name">%s</xliff:g>\'</string>
 
     <!-- Preference title -->
     <string name="vpn_user_certificate_title">Set user certificate</string>
@@ -1953,21 +1953,21 @@
     <string name="vpn_dns_search_list">DNS search domains</string>
 
     <!-- Summary text to hint that the value is set -->
-    <string name="vpn_field_is_set">%s is set</string>
+    <string name="vpn_field_is_set"><xliff:g id="value">%s</xliff:g> is set</string>
     <!-- Summary text to hint that the value is not set -->
-    <string name="vpn_field_not_set">%s not set</string>
+    <string name="vpn_field_not_set"><xliff:g id="value">%s</xliff:g> not set</string>
     <!-- Summary text to hint that the value is not set but it's not required-->
-    <string name="vpn_field_not_set_optional">%s not set (optional)</string>
+    <string name="vpn_field_not_set_optional"><xliff:g id="value">%s</xliff:g> not set (optional)</string>
 
     <!-- CheckBoxPreference title to enable something -->
-    <string name="vpn_enable_field">Enable %s</string>
+    <string name="vpn_enable_field">Enable <xliff:g id="option">%s</xliff:g></string>
     <!-- CheckBoxPreference title to disable something -->
-    <string name="vpn_disable_field">Disable %s</string>
+    <string name="vpn_disable_field">Disable <xliff:g id="option">%s</xliff:g></string>
 
     <!-- CheckBoxPreference summary to hint that something is enabled -->
-    <string name="vpn_is_enabled">%s is enabled</string>
+    <string name="vpn_is_enabled"><xliff:g id="option">%s</xliff:g> is enabled</string>
     <!-- CheckBoxPreference summary to hint that something is disabled -->
-    <string name="vpn_is_disabled">%s is disabled</string>
+    <string name="vpn_is_disabled"><xliff:g id="option">%s</xliff:g> is disabled</string>
 
     <!-- Title of preference to enter the VPN settings activity -->
     <string name="vpn_settings_title">VPN settings</string>
@@ -2025,7 +2025,7 @@
     <string name="cstor_first_time_hint_from_action">Set a password for the credential storage.</string>
     <string name="cstor_password_error">Please enter the correct password.</string>
     <string name="cstor_password_error_reset_warning">Please enter the correct password. You have one more try to enter the correct password before the credential storage is erased.</string>
-    <string name="cstor_password_error_reset_warning_plural">Please enter the correct password. You have %d more tries to enter the correct password before the credential storage is erased.</string>
+    <string name="cstor_password_error_reset_warning_plural">Please enter the correct password. You have <xliff:g id="number" example="5">%d</xliff:g> more tries to enter the correct password before the credential storage is erased.</string>
     <string name="cstor_passwords_error">Passwords do not match.</string>
     <string name="cstor_passwords_empty_error">You must enter and confirm a password.</string>
     <string name="cstor_password_empty_error">Please enter the password.</string>
@@ -2040,7 +2040,7 @@
     <!-- toast message -->
     <string name="cstor_is_enabled">Credential storage is enabled.</string>
     <!-- toast message -->
-    <string name="cstor_is_added">%s is added.</string>
+    <string name="cstor_is_added"><xliff:g id="credential">%s</xliff:g> is added.</string>
 
     <!-- Sound settings screen, setting check box label -->
     <string name="emergency_tone_title">Emergency tone</string>