diff --git a/res/values/strings.xml b/res/values/strings.xml
index d9bdb85d317..40a45ec6638 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -575,9 +575,9 @@
     <string name="sdcard_settings_read_only_status" product="nosdcard">USB storage mounted read-only.</string>
     <!-- Message when the SD card is mounted as read only -->
     <string name="sdcard_settings_read_only_status" product="default">SD card mounted read-only.</string>
-    <!-- SetupWizard strings used by DateTimeSettingsSetupWizard.  The button label for going to the next screen without storing the setting. [CHAR LIMIT=5] -->
+    <!-- Used in setup wizard Wi-Fi screen.  The button label for going to the next screen without submitting. [CHAR LIMIT=20] -->
     <string name="skip_label">Skip</string>
-    <!-- SetupWizard strings used by DateTimeSettingsSetupWizard.  The button label for going to the next screen. -->
+    <!-- Used in setup wizard Wi-Fi screen. The button label for going to the next screen and submitting. [CHAR LIMIT=20] -->
     <string name="next_label">Next</string>
 
     <!-- LocalePicker -->
@@ -4457,10 +4457,10 @@
          Used in Wifi Setup For Setup Wizard with XL screen. -->
     <string name="wifi_setup_refresh_list">Refresh list</string>
     <!-- Button message shown on the button enabling users skip Wifi Setup.
-         Used in Wifi Setup For Setup Wizard with XL screen. -->
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=10] -->
     <string name="wifi_setup_skip">Skip</string>
     <!-- Button message shown on the button enabling users go the next step.
-         Used in Wifi Setup For Setup Wizard with XL screen. -->
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=10] -->
     <string name="wifi_setup_next">Next</string>
     <!-- Button label to go back to previous screen. Used in SetupWizard for
       XLarge screen [CHAR LIMIT=10] -->