Snap for 9305732 from 102125d5629e4aaf487565d24427de1338350bbe to tm-d4-release
Change-Id: I741407491d4614002eb919031aa90f3177bf5a7e
diff --git a/OsuLogin/res/values-en-rCA/strings.xml b/OsuLogin/res/values-en-rCA/strings.xml
index fb4fb1d..e9cd9d4 100644
--- a/OsuLogin/res/values-en-rCA/strings.xml
+++ b/OsuLogin/res/values-en-rCA/strings.xml
@@ -2,6 +2,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="8761601515208336125">"OsuLogin"</string>
- <string name="action_bar_label" msgid="5057300678161244769">"Online sign-up"</string>
+ <string name="action_bar_label" msgid="5057300678161244769">"Online Sign Up"</string>
<string name="sign_up_failed" msgid="7134357507175557124">"Sign-up failed"</string>
</resources>
diff --git a/service/ServiceWifiResources/res/values-en-rCA/strings.xml b/service/ServiceWifiResources/res/values-en-rCA/strings.xml
index 0454884..9d8e629 100644
--- a/service/ServiceWifiResources/res/values-en-rCA/strings.xml
+++ b/service/ServiceWifiResources/res/values-en-rCA/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="wifiResourcesAppLabel" product="default" msgid="3120115613525263696">"System Wi-Fi resources"</string>
+ <string name="wifiResourcesAppLabel" product="default" msgid="3120115613525263696">"System Wi-Fi Resources"</string>
<string name="wifi_available_title" msgid="3899472737467127635">"Connect to open Wi‑Fi network"</string>
<string name="wifi_available_title_connecting" msgid="7233590022728579868">"Connecting to Wi‑Fi network"</string>
<string name="wifi_available_title_connected" msgid="6329493859989844201">"Connected to Wi‑Fi network"</string>
@@ -30,7 +30,7 @@
<string name="wifi_suggestion_title" msgid="2564179935989099139">"Allow suggested Wi‑Fi networks?"</string>
<string name="wifi_suggestion_content" msgid="6985149577828091835">"<xliff:g id="NAME">%s</xliff:g> suggested networks. Device may connect automatically."</string>
<string name="wifi_suggestion_action_allow_app" msgid="7757859972144671588">"Allow"</string>
- <string name="wifi_suggestion_action_disallow_app" msgid="4565857699629860726">"No, thanks"</string>
+ <string name="wifi_suggestion_action_disallow_app" msgid="4565857699629860726">"No thanks"</string>
<string name="wifi_suggestion_imsi_privacy_title" msgid="8969261812845304079">"Connect to <xliff:g id="CARRIERNAME">%s</xliff:g> Wi‑Fi?"</string>
<string name="wifi_suggestion_imsi_privacy_content" msgid="4266931269306079184">"These networks receive a SIM ID that can be used to track device location"</string>
<string name="wifi_suggestion_action_allow_imsi_privacy_exemption_carrier" msgid="3888538126440442636">"Connect"</string>
@@ -40,14 +40,14 @@
<string name="wifi_suggestion_action_allow_imsi_privacy_exemption_confirmation" msgid="2168947026413431603">"Connect"</string>
<string name="wifi_suggestion_action_disallow_imsi_privacy_exemption_confirmation" msgid="5156881939985876066">"Don\'t connect"</string>
<string name="wifi_wakeup_onboarding_title" msgid="3868826648004934540">"Wi‑Fi will turn on automatically"</string>
- <string name="wifi_wakeup_onboarding_subtext" msgid="5705886295837387430">"When you\'re near a high‑quality saved network"</string>
+ <string name="wifi_wakeup_onboarding_subtext" msgid="5705886295837387430">"When you\'re near a high quality saved network"</string>
<string name="wifi_wakeup_onboarding_action_disable" msgid="6209706680391785825">"Don\'t turn back on"</string>
<string name="wifi_wakeup_enabled_title" msgid="5043486751612595850">"Wi‑Fi turned on automatically"</string>
<string name="wifi_wakeup_enabled_content" msgid="3911262526267025882">"You\'re near a saved network: <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
<string name="wifi_watchdog_network_disabled" msgid="5769226742956006362">"Couldn\'t connect to Wi-Fi"</string>
- <string name="wifi_watchdog_network_disabled_detailed" msgid="1725243835135539125">" has a poor Internet connection."</string>
+ <string name="wifi_watchdog_network_disabled_detailed" msgid="1725243835135539125">" has a poor internet connection."</string>
<string name="wifi_connect_alert_title" msgid="2368200646665663612">"Allow connection?"</string>
- <string name="wifi_connect_alert_message" msgid="7226456300982080746">"Application %1$s would like to connect to Wi-Fi Network %2$s"</string>
+ <string name="wifi_connect_alert_message" msgid="7226456300982080746">"Application %1$s would like to connect to Wifi Network %2$s"</string>
<string name="wifi_connect_default_application" msgid="8917703737222707062">"An application"</string>
<string name="accept" msgid="8346431649376483879">"Accept"</string>
<string name="decline" msgid="4172251727603762084">"Decline"</string>
@@ -65,56 +65,56 @@
<string name="wifi_cannot_connect_with_randomized_mac_title" msgid="2344570489693915253">"Can\'t connect to <xliff:g id="SSID">%1$s</xliff:g>"</string>
<string name="wifi_cannot_connect_with_randomized_mac_message" msgid="4834133226521813352">"Tap to change privacy settings and retry"</string>
<string name="wifi_disable_mac_randomization_dialog_title" msgid="2054540994993681606">"Change privacy setting?"</string>
- <string name="wifi_disable_mac_randomization_dialog_message" msgid="8874064864332248988">"To connect, <xliff:g id="SSID">%1$s</xliff:g> needs to use your device MAC address, a unique identifier. Currently, your privacy setting for this network uses a randomised identifier. \n\nThis change may allow your device\'s location to be tracked by nearby devices."</string>
+ <string name="wifi_disable_mac_randomization_dialog_message" msgid="8874064864332248988">"To connect, <xliff:g id="SSID">%1$s</xliff:g> needs to use your device MAC address, a unique identifier. Currently, your privacy setting for this network uses a randomized identifier. \n\nThis change may allow your device\'s location to be tracked by nearby devices."</string>
<string name="wifi_disable_mac_randomization_dialog_confirm_text" msgid="6954419863076751626">"Change setting"</string>
<string name="wifi_disable_mac_randomization_dialog_success" msgid="5849155828154391387">"Setting updated. Try connecting again."</string>
<string name="wifi_disable_mac_randomization_dialog_failure" msgid="2894643619143813096">"Can\'t change privacy setting"</string>
<string name="wifi_disable_mac_randomization_dialog_network_not_found" msgid="7359256966900782004">"Network not found"</string>
- <string name="wifi_eap_error_message_code_32756" msgid="2620877003804313434">"<xliff:g id="SSID">%1$s</xliff:g>: EAP authentication error 32756"</string>
+ <string name="wifi_eap_error_message_code_32756" msgid="2620877003804313434">"<xliff:g id="SSID">%1$s</xliff:g> : EAP authentication error 32756"</string>
<!-- no translation found for wifi_eap_error_message_code_32756_carrier_overrides:0 (9114567205305206743) -->
<string name="wifi_eap_error_message_code_32760" msgid="5258191595973470188">"<xliff:g id="SSID">%1$s</xliff:g> : EAP authentication error 32760"</string>
<string-array name="wifi_eap_error_message_code_32760_carrier_overrides">
- <item msgid="7582366019846559418">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : You can’t connect to Verizon Wi-Fi access from outside the Verizon coverage area. (Error = 32760)"</item>
+ <item msgid="7582366019846559418">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : You can’t connect to Verizon Wi-Fi Access from outside the Verizon coverage area. (Error = 32760)"</item>
</string-array>
<string name="wifi_eap_error_message_code_32761" msgid="3962610712123291591">"<xliff:g id="SSID">%1$s</xliff:g> : EAP authentication error 32761"</string>
<string-array name="wifi_eap_error_message_code_32761_carrier_overrides">
- <item msgid="5173744897521799785">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : You are not subscribed to Verizon Wi-Fi access. Please call us on 800-922-0204. (Error = 32761)"</item>
+ <item msgid="5173744897521799785">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : You are not subscribed to Verizon Wi-Fi Access. Please call us at 800-922-0204. (Error = 32761)"</item>
</string-array>
<string name="wifi_eap_error_message_code_32762" msgid="2381670648753465737">"<xliff:g id="SSID">%1$s</xliff:g> : EAP authentication error 32762"</string>
<string-array name="wifi_eap_error_message_code_32762_carrier_overrides">
- <item msgid="2911560823350042826">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : There is a problem with your Verizon Wi-Fi access account. Please call us on 800-922-0204. (Error = 32762)"</item>
+ <item msgid="2911560823350042826">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : There is a problem with your Verizon Wi-Fi Access account. Please call us at 800-922-0204. (Error = 32762)"</item>
</string-array>
<string name="wifi_eap_error_message_code_32763" msgid="4467733260757049969">"<xliff:g id="SSID">%1$s</xliff:g> : EAP authentication error 32763"</string>
<string-array name="wifi_eap_error_message_code_32763_carrier_overrides">
- <item msgid="591026649262091217">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : You are already connected to Verizon Wi-Fi access. (Error = 32763)"</item>
+ <item msgid="591026649262091217">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : You are already connected to Verizon Wi-Fi Access. (Error = 32763)"</item>
</string-array>
<string name="wifi_eap_error_message_code_32764" msgid="7349538467012877101">"<xliff:g id="SSID">%1$s</xliff:g> : EAP authentication error 32764"</string>
<string-array name="wifi_eap_error_message_code_32764_carrier_overrides">
- <item msgid="3909719534712787947">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : There is a problem connecting you to Verizon Wi-Fi access. Please call us on 800-922-0204. (Error = 32764)"</item>
+ <item msgid="3909719534712787947">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : There is a problem connecting you to Verizon Wi-Fi Access. Please call us at 800-922-0204. (Error = 32764)"</item>
</string-array>
<string name="wifi_eap_error_message_code_32765" msgid="2167528358066037980">"<xliff:g id="SSID">%1$s</xliff:g> : EAP authentication error 32765"</string>
<string-array name="wifi_eap_error_message_code_32765_carrier_overrides">
- <item msgid="7454136618636618962">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : There is a problem with your Verizon Wi-Fi access account. Please call us on 800-922-0204. (Error = 32765)"</item>
+ <item msgid="7454136618636618962">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : There is a problem with your Verizon Wi-Fi Access account. Please call us at 800-922-0204. (Error = 32765)"</item>
</string-array>
<string name="wifi_eap_error_message_code_32766" msgid="2335996367705677670">"<xliff:g id="SSID">%1$s</xliff:g> : EAP authentication error 32766"</string>
<string-array name="wifi_eap_error_message_code_32766_carrier_overrides">
- <item msgid="5876210184761573755">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi access is not available from your location. Try again later or try from a different location. (Error = 32766)"</item>
+ <item msgid="5876210184761573755">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : Verizon Wi-Fi Access is not available from your location. Try again later or try from a different location. (Error = 32766)"</item>
</string-array>
<string name="wifi_eap_error_message_code_32767" msgid="7094289719914089006">"<xliff:g id="SSID">%1$s</xliff:g> : EAP authentication error 32767"</string>
<string-array name="wifi_eap_error_message_code_32767_carrier_overrides">
- <item msgid="873264900678243330">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : There is a problem connecting you to Verizon Wi-Fi access. Try again later or try from a different location."</item>
+ <item msgid="873264900678243330">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : There is a problem connecting you to Verizon Wi-Fi Access. Try again later or try from a different location."</item>
</string-array>
<string name="wifi_eap_error_message_code_16384" msgid="575394783233092922">"<xliff:g id="SSID">%1$s</xliff:g> : EAP authentication error 16384"</string>
<string-array name="wifi_eap_error_message_code_16384_carrier_overrides">
- <item msgid="5042774904407799226">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : There is a problem connecting you to Verizon Wi-Fi access due to error 16384."</item>
+ <item msgid="5042774904407799226">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : There is a problem connecting you to Verizon Wi-Fi Access due to error 16384."</item>
</string-array>
<string name="wifi_eap_error_message_code_16385" msgid="8392878664662215609">"<xliff:g id="SSID">%1$s</xliff:g> : EAP authentication error 16385"</string>
<string-array name="wifi_eap_error_message_code_16385_carrier_overrides">
- <item msgid="1251122579833932025">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : There is a problem connecting you to Verizon Wi-Fi access due to error 16385."</item>
+ <item msgid="1251122579833932025">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : There is a problem connecting you to Verizon Wi-Fi Access due to error 16385."</item>
</string-array>
<string name="wifi_eap_error_message_unknown_error_code" msgid="4480884285384231323">"<xliff:g id="SSID">%1$s</xliff:g> : EAP authentication error, unknown error code"</string>
<string-array name="wifi_eap_error_message_unknown_error_code_carrier_overrides">
- <item msgid="6141795443609380009">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : There is a problem connecting you to Verizon Wi-Fi access."</item>
+ <item msgid="6141795443609380009">"<xliff:g id="CARRIER_ID_PREFIX">:::1839:::</xliff:g><xliff:g id="SSID">%1$s</xliff:g> : There is a problem connecting you to Verizon Wi-Fi Access."</item>
</string-array>
<string name="wifi_softap_auto_shutdown_timeout_expired_title" msgid="4896534374569504484">"Hotspot turned off"</string>
<string name="wifi_softap_auto_shutdown_timeout_expired_summary" msgid="7975476698140267728">"No devices connected. Tap to modify."</string>
@@ -129,8 +129,8 @@
<string name="wifi_ca_cert_dialog_continue_text" msgid="1674156611893471003">"Yes, connect"</string>
<string name="wifi_ca_cert_dialog_abort_text" msgid="1303170595421648059">"No, don\'t connect"</string>
<string name="wifi_ca_cert_dialog_message_hint" msgid="5969214285536370126">"Only allow this network to connect if the information below looks correct.\n\n"</string>
- <string name="wifi_ca_cert_dialog_message_server_name_text" msgid="3707809865604348289">"Server name:\n<xliff:g id="VALUE">%1$s</xliff:g>\n\n"</string>
- <string name="wifi_ca_cert_dialog_message_issuer_name_text" msgid="1147216922475192304">"Issuer name:\n<xliff:g id="VALUE">%1$s</xliff:g>\n\n"</string>
+ <string name="wifi_ca_cert_dialog_message_server_name_text" msgid="3707809865604348289">"Server Name:\n<xliff:g id="VALUE">%1$s</xliff:g>\n\n"</string>
+ <string name="wifi_ca_cert_dialog_message_issuer_name_text" msgid="1147216922475192304">"Issuer Name:\n<xliff:g id="VALUE">%1$s</xliff:g>\n\n"</string>
<string name="wifi_ca_cert_dialog_message_organization_text" msgid="4936354600863239487">"Organization:\n<xliff:g id="VALUE">%1$s</xliff:g>\n\n"</string>
<string name="wifi_ca_cert_dialog_message_contact_text" msgid="5799083318641183815">"Contact:\n<xliff:g id="VALUE">%1$s</xliff:g>\n\n"</string>
<string name="wifi_ca_cert_dialog_message_signature_name_text" msgid="704614002854299776">"Signature:\n<xliff:g id="VALUE">%1$s</xliff:g>\n\n"</string>
