Merge "Fix WPS string" into jb-dev

    <string name="wifi_wps_available_first_item">WPS available</string>

    <!-- Substring of wifi status when Wi-Fi Protected Setup (WPS) is available and

         string is listed after a wifi_secured_* string-->

    <string name="wifi_wps_available_second_item">\u0020(protected network available)</string>

    <string name="wifi_wps_available_second_item">\u0020(WPS available)</string>

    <!-- Substring of wifi status for wifi with authentication.  This version is for when the

         string is first in the list (titlecase in english) -->

    <string name="wifi_secured_first_item">Secured with <xliff:g id="wifi_security_short">%1$s</xliff:g></string>