Merge "Displays frequency on connected WiFi network info. Bug: 12767819"

diff --combined res/values/strings.xml
index 5b4bf28,882ae55..1d6c751
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -1437,6 -1437,8 +1437,8 @@@
      <string name="wifi_status">Status</string>
      <!-- Label for the link speed of the connection -->
      <string name="wifi_speed">Link speed</string>
+     <!-- Label for the frequency band of the connection -->
+     <string name="wifi_frequency">Frequency</string>
      <!-- Label for the IP address of the connection -->
      <string name="wifi_ip_address">IP address</string>
      <!-- Hint text for the IP address -->
@@@ -2397,7 -2399,7 +2399,7 @@@
      <!-- SMS Application [CHAR LIMIT=35]-->
      <string name="sms_application_title" translatable="true">Default SMS app</string>
      <string name="sms_change_default_dialog_title" translatable="true">Change SMS app?</string>
 -    <string name="sms_change_default_dialog_text" translatable="true">Use <xliff:g id="new_app">%s</xliff:g> instead of <xliff:g id="current_app">%s</xliff:g> as your SMS app?</string>
 +    <string name="sms_change_default_dialog_text" translatable="true">Use <xliff:g id="new_app">%1$s</xliff:g> instead of <xliff:g id="current_app">%2$s</xliff:g> as your SMS app?</string>
      <string name="sms_change_default_no_previous_dialog_text" translatable="true">Use <xliff:g id="new_app">%s</xliff:g> as your SMS app?</string>
  
      <!-- The SIM operator is not known [CHAR_ LIMIT=50]-->
@@@ -3606,7 -3608,7 +3608,7 @@@
      <!-- Label for power consumed when Idle -->
      <string name="power_idle" product="default">Phone idle</string>
      <!-- Label for power that we aren't able to account for -->
 -    <string name="power_unaccounted">Unknown</string>
 +    <string name="power_unaccounted">Miscellaneous</string>
      <!-- Label for power that we computed too much for -->
      <string name="power_overcounted">Over-counted</string>
  
@@@ -5006,37 -5008,25 +5008,37 @@@
  
      <!-- Notifications on lockscreen -->
      <!-- Label for checkbox controlling the contents of notifications shown on
 -         the secure lockscreen [CHAR LIMIT=16] -->
 -    <string name="lock_screen_notifications">Show notifications</string>
 +         the secure lockscreen [CHAR LIMIT=25] -->
 +    <string name="lock_screen_notifications">Show when locked</string>
      <!-- Summary for lock_screen_notifications: sensitive information will be
           hidden or redacted from notifications shown on a secure lock screen
           [CHAR LIMIT=50] -->
 -    <string name="lock_screen_notifications_summary_off">Sensitive notification contents will be hidden when locked</string>
 +    <string name="lock_screen_notifications_summary_off">Sensitive notification contents will be hidden on the lock screen</string>
      <!-- Summary for lock_screen_notifications: all information will be
           shown in notifications shown on a secure lock screen
           [CHAR LIMIT=50] -->
 -    <string name="lock_screen_notifications_summary_on">All notification contents will be shown when locked</string>
 +    <string name="lock_screen_notifications_summary_on">All notification contents will be shown on the lock screen</string>
  
      <!-- [CHAR LIMIT=30] Sound settings screen, setting option name to change zen mode -->
 -    <string name="title_zen_mode">Zen mode</string>
 -    <!-- [CHAR LIMIT=30] Sound settings screen, setting option summary displaying the currently selected zen mode -->
 -    <string name="summary_zen_mode" translatable="false">%1$s</string>
 -    <!-- [CHAR LIMIT=40] Sound settings screen, title of dialog for picking zen mode -->
 -    <string name="dialog_title_zen_mode">Zen mode</string>
 +    <string name="title_zen_mode">Limited interruptions</string>
      <!-- [CHAR LIMIT=30] Sound settings screen, description for configuring zen mode -->
 -    <string name="configure_zen_mode_description">Configure Zen mode</string>
 +    <string name="configure_zen_mode_description">Configure limited interruptions</string>
      <!-- [CHAR LIMIT=30] Zen mode settings screen, activity title -->
      <string name="zen_mode_settings_title">Limited Interruptions</string>
 +
 +    <!-- [CHAR LIMIT=20] Notifications settings header -->
 +    <string name="notification_settings">Notifications</string>
 +
 +    <!-- [CHAR LIMIT=20] Notifications settings: General section header -->
 +    <string name="notification_settings_general">General</string>
 +
 +    <!-- [CHAR LIMIT=20] Notifications settings: Security section header -->
 +    <string name="notification_settings_security">Security</string>
 +
 +    <!-- [CHAR LIMIT=20] Notifications settings: Tweaks section header (eng
 +         builds only) -->
 +    <string name="notification_settings_tweaks">Tweaks</string>
 +
 +    <!-- [CHAR LIMIT=20] Notifications settings: Apps section header -->
 +    <string name="notification_settings_apps">Apps</string>
  </resources>