Merge sc-v2-dev-plus-aosp-without-vendor@8084891sam_222710654

Bug: 214455710 Merged-In: Ibe898cf6d6446670c1318b2cdd845a7982ce02f7 Change-Id: I01f93f6aef720802d197f5ff852ca0df5b80a46b
author: Xin Li <delphij@google.com> 2022-02-11 06:57:37 +0000
committer: Xin Li <delphij@google.com> 2022-02-11 06:57:37 +0000
commit: 824ec7c60083a79b0136d4dfd0aac04a3ba296fe (patch)
tree: 68c3942bf24ead4eee953b51296cd0a590f4106b
parent: d6bb1970060701be28ceb83d45979c74b0176bf8 (diff)
parent: ee9b6270e2011e4e90f7043d7794d4c6bdb91154 (diff)
download: wifi-sam_222710654.tar.gz
107 files changed, 779 insertions, 428 deletions
diff --git a/libs/WifiTrackerLib/res/values-af/strings.xml b/libs/WifiTrackerLib/res/values-af/strings.xml
index a31e8ccb1..275c36b2b 100644
--- a/libs/WifiTrackerLib/res/values-af/strings.xml
+++ b/libs/WifiTrackerLib/res/values-af/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Swak sein. Probeer nader aan die roeteerder beweeg."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Netwerk is oor kapasiteit. Probeer later weer."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Kan nie koppel nie. Probeer later weer."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Kan nie koppel nie. Probeer later weer."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Netwerk is nie met hierdie toestel versoenbaar nie"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Ontkoppel"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Gestoor"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Beperk"</string>
diff --git a/libs/WifiTrackerLib/res/values-am/strings.xml b/libs/WifiTrackerLib/res/values-am/strings.xml
index 4eef0a767..9391ccf5b 100644
--- a/libs/WifiTrackerLib/res/values-am/strings.xml
+++ b/libs/WifiTrackerLib/res/values-am/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"ደካማ ሲግናል። ወደ ራውተር ለመቅረብ ይሞክሩ።"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"አውታረመረብ ከአቅም በላይ ነው። ቆይተው እንደገና ይሞክሩ።"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"መገናኘት አልተቻለም። ቆይተው እንደገና ይሞክሩ።"</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"መገናኘት አልተቻለም። ቆይተው እንደገና ይሞክሩ።"</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"አውታረ መረብ ከዚህ መሣሪያ ጋር ተኳሃኝ አይደለም"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"ተቋርጧል"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"ተቀምጧል"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"የሚለካ"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"መካከለኛ"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"ፈጣን"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"በጣም ፈጣን"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Wifi ለአሁን በራስ-ሰር አይገናኝም"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-ar/strings.xml b/libs/WifiTrackerLib/res/values-ar/strings.xml
index cf3ec7065..58aae2950 100644
--- a/libs/WifiTrackerLib/res/values-ar/strings.xml
+++ b/libs/WifiTrackerLib/res/values-ar/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"الإشارة ضعيفة. حاوِل الاقتراب من جهاز التوجيه."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"تجاوزت الشبكة الحد الأقصى للسعة. يُرجى إعادة المحاولة لاحقًا."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"يتعذّر الاتصال بالشبكة. يُرجى إعادة المحاولة لاحقًا."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"يتعذّر الاتصال بالشبكة. يُرجى إعادة المحاولة لاحقًا."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"الشبكة غير متوافقة مع هذا الجهاز."</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"غير متصلة"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"شبكة محفوظة"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"تفرض تكلفة استخدام"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"متوسطة"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"سريعة"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"سريعة جدًا"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"‏لن يتم الاتصال بشبكة Wi-Fi تلقائيًا في الوقت الحالي."</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-as/strings.xml b/libs/WifiTrackerLib/res/values-as/strings.xml
index 6a5802a75..5afd87294 100644
--- a/libs/WifiTrackerLib/res/values-as/strings.xml
+++ b/libs/WifiTrackerLib/res/values-as/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"দুৰ্বল সংকেত। ৰাউটাৰৰ ওচৰলৈ গৈ চাওক।"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"নেটৱৰ্কে অধিকতম ক্ষমতা অতিক্ৰম কৰিছে। পাছত পুনৰ চেষ্টা কৰক।"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"সংযোগ কৰিব নোৱাৰি। পাছত পুনৰ চেষ্টা কৰক।"</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"সংযোগ কৰিব পৰা নাই। পাছত পুনৰ চেষ্টা কৰক।"</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"নেটৱৰ্কে এই ডিভাইচটোৰ সৈতে কাম কৰিব নোৱাৰে"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"সংযোগ বিচ্ছিন্ন হৈছে"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"ছেভ কৰা আছে"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"নিৰিখ-নিৰ্দিষ্ট"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"মধ্যমীয়া"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"দ্ৰুত"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"অতি দ্ৰুত"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"সদ্যহতে ৱাই-ফাই স্বয়ংক্ৰিয়ভাৱে সংযুক্ত নহ’ব"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-az/strings.xml b/libs/WifiTrackerLib/res/values-az/strings.xml
index c3c076ad8..1b8b157c3 100644
--- a/libs/WifiTrackerLib/res/values-az/strings.xml
+++ b/libs/WifiTrackerLib/res/values-az/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Zəif siqnal. Ruterə yaxınlaşdırın."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Şəbəkə limiti aşılıb. Sonra cəhd edin."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Qoşulmaq mümkün deyil. Sonra cəhd edin."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Qoşulmaq mümkün deyil. Sonra cəhd edin."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Şəbəkə bu cihaz ilə uyğun deyil"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Bağlantı kəsildi"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Yadda saxlandı"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Tarif sayğacılı"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Orta"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Sürətli"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Çox Sürətli"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Wi-Fi hələlik avtomatik qoşulmayacaq"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-b+sr+Latn/strings.xml b/libs/WifiTrackerLib/res/values-b+sr+Latn/strings.xml
index 5921dd6b5..26bac70ac 100644
--- a/libs/WifiTrackerLib/res/values-b+sr+Latn/strings.xml
+++ b/libs/WifiTrackerLib/res/values-b+sr+Latn/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Slab signal. Probajte da se približite ruteru."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Kapacitet mreže je premašen. Probajte ponovo kasnije."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Povezivanje nije uspelo. Probajte ponovo kasnije."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Povezivanje nije uspelo. Probajte ponovo kasnije."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Mreža nije kompatibilna sa ovim uređajem"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Veza je prekinuta"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Sačuvano"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Sa ograničenjem"</string>
diff --git a/libs/WifiTrackerLib/res/values-be/strings.xml b/libs/WifiTrackerLib/res/values-be/strings.xml
index 8b9e73fd3..4aa06ba0c 100644
--- a/libs/WifiTrackerLib/res/values-be/strings.xml
+++ b/libs/WifiTrackerLib/res/values-be/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Слабы сігнал. Перамясціцеся бліжэй да маршрутызатара."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Сетка перагружана. Паўтарыце спробу пазней."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Не ўдалося падключыцца. Паўтарыце спробу пазней."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Не ўдалося падключыцца. Паўтарыце спробу пазней."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Сетка не сумяшчальная з гэтай прыладай."</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Адключана"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Захавана"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"З падлікам трафіка"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Сярэдняя"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Хуткая"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Вельмі хуткая"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Аўтаматычнае падключэнне да Wi-Fi адсутнічае"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-bg/strings.xml b/libs/WifiTrackerLib/res/values-bg/strings.xml
index 4385f9739..b6bcb0782 100644
--- a/libs/WifiTrackerLib/res/values-bg/strings.xml
+++ b/libs/WifiTrackerLib/res/values-bg/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Сигналът е слаб. Приближете се до рутера."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Капацитетът на мрежата е надхвърлен. Опитайте отново по-късно."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Не може да се установи връзка. Опитайте отново по-късно."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Не може да се установи връзка. Опитайте отново по-късно."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Мрежата не е съвместима с това устройство"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Няма връзка"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Запазено"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"С отчитане"</string>
diff --git a/libs/WifiTrackerLib/res/values-bn/strings.xml b/libs/WifiTrackerLib/res/values-bn/strings.xml
index b5135f3c8..37564af5e 100644
--- a/libs/WifiTrackerLib/res/values-bn/strings.xml
+++ b/libs/WifiTrackerLib/res/values-bn/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"দুর্বল সিগনাল। রাউটারের কাছে যান।"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"নেটওয়ার্কে লোডের সীমা পেরিয়ে গেছে। পরে আবার চেষ্টা করুন।"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"কানেক্ট করা যাচ্ছে না। পরে আবার চেষ্টা করুন।"</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"কানেক্ট করা যাচ্ছে না। পরে আবার চেষ্টা করুন।"</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"এই ডিভাইসে নেটওয়ার্ক ব্যবহার করা যাবে না"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"ডিসকানেক্ট করা হয়েছে"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"সেভ করা হয়েছে"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"মিটার্ড"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"মাঝারি"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"দ্রুত"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"খুব দ্রুত"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"এখন ওয়াই-ফাই নিজে থেকে কানেক্ট হবে না"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-bs/strings.xml b/libs/WifiTrackerLib/res/values-bs/strings.xml
index 045a8ab72..c68b9e7a7 100644
--- a/libs/WifiTrackerLib/res/values-bs/strings.xml
+++ b/libs/WifiTrackerLib/res/values-bs/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Slab signal. Približite se ruteru."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Mreža je premašila kapacitet. Pokušajte ponovo kasnije."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Nije se moguće povezati. Pokušajte ponovo kasnije."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Nije se moguće povezati. Pokušajte ponovo kasnije."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Mreža nije kompatibilna s ovim uređajem"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Veza je prekinuta"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Sačuvano"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"S naplatom"</string>
@@ -55,7 +55,7 @@
     <string name="wifitrackerlib_imsi_protection_warning" msgid="7202210931586169466">"Ova mreža prima ID SIM-a koji se može koristiti za praćenje lokacije uređaja. "<annotation id="url">"Saznajte više"</annotation></string>
     <string name="wifitrackerlib_speed_label_very_slow" msgid="6606409259798814244">"Veoma sporo"</string>
     <string name="wifitrackerlib_speed_label_slow" msgid="7327906382011957760">"Sporo"</string>
-    <string name="wifitrackerlib_speed_label_okay" msgid="6656684124654881956">"Uredu"</string>
+    <string name="wifitrackerlib_speed_label_okay" msgid="6656684124654881956">"UREDU"</string>
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Srednje"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Brzo"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Veoma brzo"</string>
diff --git a/libs/WifiTrackerLib/res/values-ca/arrays.xml b/libs/WifiTrackerLib/res/values-ca/arrays.xml
index 8c28cf048..3d226f588 100644
--- a/libs/WifiTrackerLib/res/values-ca/arrays.xml
+++ b/libs/WifiTrackerLib/res/values-ca/arrays.xml
@@ -26,7 +26,7 @@
     <item msgid="9055468790485684083">"S\'està connectant…"</item>
     <item msgid="6099499723199990208">"S\'està autenticant…"</item>
     <item msgid="6794055951297347103">"S\'està obtenint l\'adreça IP…"</item>
-    <item msgid="5450920562291300229">"Connectat"</item>
+    <item msgid="5450920562291300229">"Connectada"</item>
     <item msgid="6332116533879646145">"Suspesa"</item>
     <item msgid="294459081501073818">"S\'està desconnectant…"</item>
     <item msgid="1577368920272598676">"Desconnectada"</item>
diff --git a/libs/WifiTrackerLib/res/values-ca/strings.xml b/libs/WifiTrackerLib/res/values-ca/strings.xml
index bcdf93178..fff114c87 100644
--- a/libs/WifiTrackerLib/res/values-ca/strings.xml
+++ b/libs/WifiTrackerLib/res/values-ca/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Senyal feble. Prova d\'apropar-te a l\'encaminador."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"La xarxa està sobrecarregada. Torna-ho a provar més tard."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"No es pot establir la connexió. Torna-ho a provar més tard."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"No es pot establir la connexió. Torna-ho a provar més tard."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"La xarxa no és compatible amb aquest dispositiu"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Desconnectada"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Desada"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"D\'ús mesurat"</string>
diff --git a/libs/WifiTrackerLib/res/values-cs/strings.xml b/libs/WifiTrackerLib/res/values-cs/strings.xml
index 027d9730d..2e4d07305 100644
--- a/libs/WifiTrackerLib/res/values-cs/strings.xml
+++ b/libs/WifiTrackerLib/res/values-cs/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Slabý signál. Zkuste se přesunout blíž k routeru."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Síť je přetížená. Zkuste to později."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Nejde se připojit. Zkuste to později."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Nejde se připojit. Zkuste to později."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Síť není kompatibilní s tímto zařízením"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Odpojeno"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Uloženo"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Měřená"</string>
diff --git a/libs/WifiTrackerLib/res/values-da/strings.xml b/libs/WifiTrackerLib/res/values-da/strings.xml
index fd089a113..342783f7d 100644
--- a/libs/WifiTrackerLib/res/values-da/strings.xml
+++ b/libs/WifiTrackerLib/res/values-da/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Svagt signal. Prøv at rykke tættere på routeren."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Netværkets kapacitet er overskredet. Prøv igen senere."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Der kan ikke oprettes forbindelse. Prøv igen senere."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Der kan ikke oprettes forbindelse. Prøv igen senere."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Netværket er ikke kompatibelt med denne enhed"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Afbrudt"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Gemt"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Forbrugsafregnet"</string>
@@ -52,7 +52,7 @@
     <string name="wifitrackerlib_osu_completing_sign_up" msgid="4359503050543182480">"Fuldfører registrering…"</string>
     <string name="wifitrackerlib_osu_sign_up_failed" msgid="3964140125523395898">"Registreringen kunne ikke fuldføres. Tryk for at prøve igen."</string>
     <string name="wifitrackerlib_osu_sign_up_complete" msgid="3279606633343124580">"Registreringen er fuldført. Opretter forbindelse…"</string>
-    <string name="wifitrackerlib_imsi_protection_warning" msgid="7202210931586169466">"Dette netværk kræver et SIM-id, der kan bruges til at spore enhedens lokation. "<annotation id="url">"Få flere oplysninger"</annotation></string>
+    <string name="wifitrackerlib_imsi_protection_warning" msgid="7202210931586169466">"Dette netværk kræver et SIM-id, der kan bruges til at spore enhedens placering. "<annotation id="url">"Få flere oplysninger"</annotation></string>
     <string name="wifitrackerlib_speed_label_very_slow" msgid="6606409259798814244">"Meget langsom"</string>
     <string name="wifitrackerlib_speed_label_slow" msgid="7327906382011957760">"Langsom"</string>
     <string name="wifitrackerlib_speed_label_okay" msgid="6656684124654881956">"OK"</string>
diff --git a/libs/WifiTrackerLib/res/values-de/strings.xml b/libs/WifiTrackerLib/res/values-de/strings.xml
index 021452961..127c10a95 100644
--- a/libs/WifiTrackerLib/res/values-de/strings.xml
+++ b/libs/WifiTrackerLib/res/values-de/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Schwaches Signal. Geh näher an den Router heran."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Das Netzwerk ist ausgelastet. Versuch es später noch einmal."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Verbindung nicht möglich. Versuch es später noch einmal."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Verbindung nicht möglich. Versuch es später noch einmal."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Das Netzwerk ist mit diesem Gerät nicht kompatibel"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Nicht verbunden"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Gespeichert"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Kostenpflichtig"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Mittel"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Schnell"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Sehr schnell"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Zurzeit wird keine automatische Verbindung mit dem WLAN hergestellt"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-el/strings.xml b/libs/WifiTrackerLib/res/values-el/strings.xml
index a217defba..13ac0fbb6 100644
--- a/libs/WifiTrackerLib/res/values-el/strings.xml
+++ b/libs/WifiTrackerLib/res/values-el/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Το σήμα είναι ασθενές. Δοκιμάστε να μετακινηθείτε πιο κοντά στον δρομολογητή."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Υπέρβαση χωρητικότητας δικτύου. Δοκιμάστε ξανά αργότερα."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Δεν είναι δυνατή η σύνδεση. Δοκιμάστε ξανά αργότερα."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Η σύνδεση δεν είναι δυνατή. Δοκιμάστε ξανά αργότερα."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Το δίκτυο δεν είναι συμβατό με αυτήν τη συσκευή"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Αποσυνδέθηκε"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Αποθηκεύτηκε"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Με ογκοχρέωση"</string>
diff --git a/libs/WifiTrackerLib/res/values-en-rAU/strings.xml b/libs/WifiTrackerLib/res/values-en-rAU/strings.xml
index 8489c2139..f64c32859 100644
--- a/libs/WifiTrackerLib/res/values-en-rAU/strings.xml
+++ b/libs/WifiTrackerLib/res/values-en-rAU/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Weak signal. Try moving closer to the router."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Network is over capacity. Try again later."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Can\'t connect. Try again later."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Can\'t connect. Try again later."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Network not compatible with this device"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Disconnected"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Saved"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Metered"</string>
diff --git a/libs/WifiTrackerLib/res/values-en-rCA/strings.xml b/libs/WifiTrackerLib/res/values-en-rCA/strings.xml
index 8489c2139..f64c32859 100644
--- a/libs/WifiTrackerLib/res/values-en-rCA/strings.xml
+++ b/libs/WifiTrackerLib/res/values-en-rCA/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Weak signal. Try moving closer to the router."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Network is over capacity. Try again later."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Can\'t connect. Try again later."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Can\'t connect. Try again later."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Network not compatible with this device"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Disconnected"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Saved"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Metered"</string>
diff --git a/libs/WifiTrackerLib/res/values-en-rGB/strings.xml b/libs/WifiTrackerLib/res/values-en-rGB/strings.xml
index 8489c2139..f64c32859 100644
--- a/libs/WifiTrackerLib/res/values-en-rGB/strings.xml
+++ b/libs/WifiTrackerLib/res/values-en-rGB/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Weak signal. Try moving closer to the router."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Network is over capacity. Try again later."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Can\'t connect. Try again later."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Can\'t connect. Try again later."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Network not compatible with this device"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Disconnected"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Saved"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Metered"</string>
diff --git a/libs/WifiTrackerLib/res/values-en-rIN/strings.xml b/libs/WifiTrackerLib/res/values-en-rIN/strings.xml
index 8489c2139..f64c32859 100644
--- a/libs/WifiTrackerLib/res/values-en-rIN/strings.xml
+++ b/libs/WifiTrackerLib/res/values-en-rIN/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Weak signal. Try moving closer to the router."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Network is over capacity. Try again later."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Can\'t connect. Try again later."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Can\'t connect. Try again later."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Network not compatible with this device"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Disconnected"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Saved"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Metered"</string>
diff --git a/libs/WifiTrackerLib/res/values-en-rXC/strings.xml b/libs/WifiTrackerLib/res/values-en-rXC/strings.xml
index efafd2099..222dbe045 100644
--- a/libs/WifiTrackerLib/res/values-en-rXC/strings.xml
+++ b/libs/WifiTrackerLib/res/values-en-rXC/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎‎‎‏‎‏‎‎‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‎‎‎‏‎‏‏‏‏‏‎‎‏‏‎‏‎Weak signal. Try moving closer to the router.‎‏‎‎‏‎"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎‎‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‏‎Network is over capacity. Try again later.‎‏‎‎‏‎"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‏‏‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‏‏‏‎‏‏‎Can\'t connect. Try again later.‎‏‎‎‏‎"</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎Can\'t connect. Try again later.‎‏‎‎‏‎"</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‏‎‎‏‎‎‎‏‏‏‎‏‎Network not compatible with this device‎‏‎‎‏‎"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‎‏‎‏‏‏‎Disconnected‎‏‎‎‏‎"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‎‎‏‎Saved‎‏‎‎‏‎"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‏‎‏‏‎‏‎‎‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‏‎Metered‎‏‎‎‏‎"</string>
diff --git a/libs/WifiTrackerLib/res/values-es-rUS/strings.xml b/libs/WifiTrackerLib/res/values-es-rUS/strings.xml
index 8f1be0391..4f32407e5 100644
--- a/libs/WifiTrackerLib/res/values-es-rUS/strings.xml
+++ b/libs/WifiTrackerLib/res/values-es-rUS/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"La señal es débil. Intenta acercarte al router."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"La red está saturada. Vuelve a intentarlo más tarde."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"No se pudo establecer conexión. Vuelve a intentarlo más tarde."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"No se pudo establecer la conexión. Vuelve a intentarlo más tarde."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"La red no es compatible con este dispositivo"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Desconectada"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Guardada"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"De uso medido"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Normal"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Rápida"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Muy rápida"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Por ahora, el Wi-Fi no se conectará automáticamente"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-es/strings.xml b/libs/WifiTrackerLib/res/values-es/strings.xml
index 7fda511f4..4f0b423c6 100644
--- a/libs/WifiTrackerLib/res/values-es/strings.xml
+++ b/libs/WifiTrackerLib/res/values-es/strings.xml
@@ -30,9 +30,9 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Señal débil. Prueba a acercarte al router."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"La red está saturada. Inténtalo de nuevo más tarde."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"No se ha podido conectar. Inténtalo de nuevo más tarde."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"No se ha podido conectar. Inténtalo de nuevo en otro momento."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Red no compatible con este dispositivo"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Desconectado"</string>
-    <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Red guardada"</string>
+    <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Guardada"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"De uso medido"</string>
     <string name="wifitrackerlib_wifi_unmetered_label" msgid="1902150402929678469">"No medida"</string>
     <string name="wifitrackerlib_connected_via_app" msgid="7823921840931347560">"Conectado mediante <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Media"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Rápida"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Muy rápida"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Por ahora no se conectará automáticamente a redes Wi-Fi"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-et/strings.xml b/libs/WifiTrackerLib/res/values-et/strings.xml
index 72cde53a1..343a690c0 100644
--- a/libs/WifiTrackerLib/res/values-et/strings.xml
+++ b/libs/WifiTrackerLib/res/values-et/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Nõrk signaal. Minge ruuterile lähemale."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Võrk on ülekoormatud. Proovige hiljem uuesti."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Ei saa ühendada. Proovige hiljem uuesti."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Ei saa ühendada. Proovige hiljem uuesti."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Võrk ei ühildu selle seadmega"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Pole ühendatud"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Salvestatud"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Mahupõhine"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Keskmine"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Kiire"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Väga kiire"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"WiFi-ühendust ei looda praegu automaatselt"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-eu/strings.xml b/libs/WifiTrackerLib/res/values-eu/strings.xml
index 8e92cca65..ce9e1695a 100644
--- a/libs/WifiTrackerLib/res/values-eu/strings.xml
+++ b/libs/WifiTrackerLib/res/values-eu/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Seinale ahula. Gerturatu bideratzailera."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Sarearen ahalmena gainditu da. Saiatu berriro geroago."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Ezin da konektatu. Saiatu berriro geroago."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Ezin da konektatu. Saiatu berriro geroago."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Sarea ez da gailu honekin bateragarria"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Deskonektatuta"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Gordeta"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Sare neurtua"</string>
diff --git a/libs/WifiTrackerLib/res/values-fa/strings.xml b/libs/WifiTrackerLib/res/values-fa/strings.xml
index b534519e8..77ca78fe5 100644
--- a/libs/WifiTrackerLib/res/values-fa/strings.xml
+++ b/libs/WifiTrackerLib/res/values-fa/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"سیگنال ضعیف است. به رهیاب نزدیک‌تر شوید."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"تعداد ایستگاه‌ها بیش‌از ظرفیت شبکه است. بعداً دوباره امتحان کنید."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"اتصال برقرار نشد. بعداً دوباره امتحان کنید."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"اتصال برقرار نشد. بعداً دوباره امتحان کنید."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"شبکه با این دستگاه سازگار نیست"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"اتصال قطع شد"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"ذخیره‌شده"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"محدود"</string>
diff --git a/libs/WifiTrackerLib/res/values-fi/strings.xml b/libs/WifiTrackerLib/res/values-fi/strings.xml
index a972b2cc1..34388224e 100644
--- a/libs/WifiTrackerLib/res/values-fi/strings.xml
+++ b/libs/WifiTrackerLib/res/values-fi/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Heikko signaali. Kokeile siirtyä lähemmäs reititintä."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Verkon kapasiteetti on ylittynyt. Yritä myöhemmin uudelleen."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Ei yhteyttä. Yritä myöhemmin uudelleen."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Ei yhteyttä. Yritä myöhemmin uudelleen."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Verkko ei yhteensopiva laitteen kanssa"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Yhteys katkaistu"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Tallennettu"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Maksullinen"</string>
diff --git a/libs/WifiTrackerLib/res/values-fr-rCA/strings.xml b/libs/WifiTrackerLib/res/values-fr-rCA/strings.xml
index 5d0c2e593..3e9de62d4 100644
--- a/libs/WifiTrackerLib/res/values-fr-rCA/strings.xml
+++ b/libs/WifiTrackerLib/res/values-fr-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="wifitrackerlib_summary_separator" msgid="6613897475167609815">" / "</string>
+    <string name="wifitrackerlib_summary_separator" msgid="6613897475167609815">"  : "</string>
     <string name="wifitrackerlib_auto_connect_disable" msgid="4714835547164460651">"La connexion automatique est désactivée"</string>
     <string name="wifitrackerlib_saved_network" msgid="5353460010746484376">"Enregistrés par <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifitrackerlib_wifi_no_internet_no_reconnect" msgid="6618216332537706908">"Reconnexion automatique impossible"</string>
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Le signal est faible. Essayez de vous rapprocher du routeur."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Le réseau a atteint sa capacité maximale. Réessayez plus tard."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Connexion impossible. Réessayez plus tard."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Connexion impossible. Réessayez plus tard."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Le réseau n\'est pas compatible avec cet appareil"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Déconnecté"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Enregistré"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Mesuré"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Moyenne"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Élevée"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Très rapide"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"La connexion automatique au Wi-Fi n\'est pas possible pour le moment"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-fr/strings.xml b/libs/WifiTrackerLib/res/values-fr/strings.xml
index f663f3180..b1178688b 100644
--- a/libs/WifiTrackerLib/res/values-fr/strings.xml
+++ b/libs/WifiTrackerLib/res/values-fr/strings.xml
@@ -30,11 +30,11 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Signal faible. Rapprochez-vous du routeur."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Le réseau est en surcapacité. Réessayez plus tard."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Connexion impossible. Réessayez plus tard."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Connexion impossible. Réessayez plus tard."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Réseau incompatible avec cet appareil"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Déconnecté"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Enregistré"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Facturé à l\'usage"</string>
-    <string name="wifitrackerlib_wifi_unmetered_label" msgid="1902150402929678469">"Sans compteur"</string>
+    <string name="wifitrackerlib_wifi_unmetered_label" msgid="1902150402929678469">"Non facturé à l\'usage"</string>
     <string name="wifitrackerlib_connected_via_app" msgid="7823921840931347560">"Connecté via <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifitrackerlib_available_via_app" msgid="8556844256194837469">"Disponible via <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifitrackerlib_connected_via_network_scorer" msgid="6306655070903763086">"Connecté automatiquement via <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -43,7 +43,7 @@
     <string name="wifitrackerlib_private_dns_broken" msgid="6049401148262718707">"Impossible d\'accéder au serveur DNS privé"</string>
     <string name="wifitrackerlib_wifi_connected_cannot_provide_internet" msgid="3803471522215612745">"Connecté à l\'appareil. Connexion Internet impossible."</string>
     <string name="wifi_connected_low_quality" msgid="4478331645458058445">"Faible qualité"</string>
-    <string name="wifitrackerlib_wifi_security_none" msgid="2686062484642847280">"Aucune"</string>
+    <string name="wifitrackerlib_wifi_security_none" msgid="2686062484642847280">"Aucun"</string>
     <string name="wifitrackerlib_wifi_passpoint_expired" msgid="7974960573887452566">"Expiré"</string>
     <string name="wifitrackerlib_tap_to_sign_up" msgid="3897017015910817402">"Appuyez ici pour vous connecter"</string>
     <string name="wifitrackerlib_tap_to_renew_subscription_and_connect" msgid="6048420776676138069">"Appuyez pour renouveler l\'abonnement et vous connecter"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Moyenne"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Rapide"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Très rapide"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Connexion automatique au Wi-Fi désactivée pour le moment"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-gl/strings.xml b/libs/WifiTrackerLib/res/values-gl/strings.xml
index 4782ce1e3..ac505f4a2 100644
--- a/libs/WifiTrackerLib/res/values-gl/strings.xml
+++ b/libs/WifiTrackerLib/res/values-gl/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Sinal feble. Proba a achegarte ao router."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"A rede está saturada. Téntao de novo máis tarde."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Non se puido establecer conexión. Téntao de novo máis tarde."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Non se puido establecer conexión. Téntao de novo máis tarde."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"A rede non é compatible con este dispositivo"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Desconectada"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Gardada"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Rede sen tarifa plana"</string>
diff --git a/libs/WifiTrackerLib/res/values-gu/strings.xml b/libs/WifiTrackerLib/res/values-gu/strings.xml
index 47984acbc..6b5e44295 100644
--- a/libs/WifiTrackerLib/res/values-gu/strings.xml
+++ b/libs/WifiTrackerLib/res/values-gu/strings.xml
@@ -26,11 +26,11 @@
     <string name="wifitrackerlib_wifi_disabled_network_failure" msgid="3046956554224277166">"IP ગોઠવણીમાં નિષ્ફળતા"</string>
     <string name="wifitrackerlib_wifi_disabled_generic" msgid="4278806060337007814">"બંધ છે"</string>
     <string name="wifitrackerlib_wifi_ap_unable_to_handle_new_sta" msgid="931922372010639716">"ઍક્સેસ પૉઇન્ટમાં હંગામી રૂપે જગ્યા નથી"</string>
-    <string name="wifitrackerlib_wifi_poor_channel_conditions" msgid="26484680900376236">"હંગામી રીતે નેટવર્કની નબળી સ્થિતિ"</string>
+    <string name="wifitrackerlib_wifi_poor_channel_conditions" msgid="26484680900376236">"હંગામી રૂપે નેટવર્કની નબળી પરિસ્થિતિ"</string>
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"નબળું સિગ્નલ. રાઉટરની નજીક જઈને પ્રયાસ કરી જુઓ."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"નેટવર્ક પર ક્ષમતા કરતાં વધારે લોડ છે. થોડા સમય પછી ફરી પ્રયાસ કરો."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"કનેક્ટ કરી શકાતું નથી. થોડા સમય પછી ફરી પ્રયાસ કરો."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"કનેક્ટ કરી શકાતું નથી. થોડા સમય પછી ફરી પ્રયાસ કરો."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"નેટવર્ક આ ડિવાઇસ સાથે સુસંગત નથી"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"ડિસ્કનેક્ટ કર્યું છે"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"સાચવેલા"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"મીટર કરેલું"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"મધ્યમ"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"ઝડપી"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"ખૂબ ઝડપી"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"હમણાં વાઇ-ફાઇ ઑટોમૅટિક રીતે કનેક્ટ નહીં થાય"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-hi/strings.xml b/libs/WifiTrackerLib/res/values-hi/strings.xml
index 6aa300ded..6161be34b 100644
--- a/libs/WifiTrackerLib/res/values-hi/strings.xml
+++ b/libs/WifiTrackerLib/res/values-hi/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"कमज़ोर सिग्नल. राऊटर के पास जाकर देखें."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"नेटवर्क पर उसकी क्षमता से ज़्यादा लोड है. कुछ देर बाद कोशिश करें."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"कनेक्ट नहीं किया जा सका. कुछ देर बाद कोशिश करें."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"कनेक्ट नहीं किया जा सका. कुछ देर बाद कोशिश करें."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"यह नेटवर्क इस डिवाइस पर काम नहीं करता है"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"डिसकनेक्ट किया गया"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"नेटवर्क सेव किया गया"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"डेटा इस्तेमाल करने की सीमा तय की गई है"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"औसत"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"तेज़"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"बहुत तेज़"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"फ़िलहाल, वाई-फ़ाई अपने-आप कनेक्ट नहीं होगा"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-hr/strings.xml b/libs/WifiTrackerLib/res/values-hr/strings.xml
index 28c0d6f49..8cb775d32 100644
--- a/libs/WifiTrackerLib/res/values-hr/strings.xml
+++ b/libs/WifiTrackerLib/res/values-hr/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Signal je slab. Pokušajte se približiti usmjerivaču."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Premašen je kapacitet mreže. Pokušajte ponovo kasnije."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Povezivanje nije uspjelo. Pokušajte ponovo kasnije."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Povezivanje nije uspjelo. Pokušajte ponovo kasnije."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Mreža nije kompatibilna s ovim uređajem"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Nije povezano"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Spremljeno"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"S ograničenim prometom"</string>
diff --git a/libs/WifiTrackerLib/res/values-hu/strings.xml b/libs/WifiTrackerLib/res/values-hu/strings.xml
index cc6e0fe3d..09b8b0c2f 100644
--- a/libs/WifiTrackerLib/res/values-hu/strings.xml
+++ b/libs/WifiTrackerLib/res/values-hu/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Gyenge jel. Próbáljon közelebb helyezkedni a routerhez."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"A hálózat túllépte a rendelkezésre álló kapacitást. Próbálja meg később."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Nem lehet csatlakozni. Próbálja meg később."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Nem lehet csatlakozni. Próbálja újra később."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"A hálózat nem kompatibilis ezzel az eszközzel."</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Szétkapcsolva"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Mentve"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Forgalomkorlátos"</string>
diff --git a/libs/WifiTrackerLib/res/values-hy/strings.xml b/libs/WifiTrackerLib/res/values-hy/strings.xml
index 593d4b77b..d51a53c68 100644
--- a/libs/WifiTrackerLib/res/values-hy/strings.xml
+++ b/libs/WifiTrackerLib/res/values-hy/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Ազդանշանը թույլ է։ Մոտեցեք երթուղիչին։"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Ցանցը գերծանրաբեռնված է։ Փորձեք ավելի ուշ։"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Կապ չկա։ Փորձեք ավելի ուշ։"</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Կապ չկա։ Փորձեք ավելի ուշ։"</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Ցանցն անհամատեղելի է այս սարքի հետ"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Կապը չեղարկված է"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Պահված է"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Վճարովի թրաֆիկ"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Միջին"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Արագ"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Շատ արագ"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Wi-Fi-ն ավտոմատ չի միանա"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-in/strings.xml b/libs/WifiTrackerLib/res/values-in/strings.xml
index 5dc847db8..1fbb2aeb7 100644
--- a/libs/WifiTrackerLib/res/values-in/strings.xml
+++ b/libs/WifiTrackerLib/res/values-in/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Sinyal lemah. Coba mendekat ke router."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Jaringan melebihi kapasitas. Coba lagi nanti."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Tidak dapat terhubung. Coba lagi nanti."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Tidak dapat terhubung. Coba lagi nanti."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Jaringan tidak kompatibel dengan perangkat ini"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Koneksi terputus"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Tersimpan"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Berbayar"</string>
diff --git a/libs/WifiTrackerLib/res/values-is/strings.xml b/libs/WifiTrackerLib/res/values-is/strings.xml
index 083899045..5c3cf48b3 100644
--- a/libs/WifiTrackerLib/res/values-is/strings.xml
+++ b/libs/WifiTrackerLib/res/values-is/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Léleg tenging. Prófaðu að færa þig nær beininum."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Hámarki netkerfis er náð. Reyndu aftur síðar."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Ekki er hægt að tengjast. Reyndu aftur síðar."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Ekki er hægt að tengjast. Reyndu aftur síðar."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Netið er ekki samhæft þessu tæki"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Aftengt"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Vistað"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Mæld notkun"</string>
diff --git a/libs/WifiTrackerLib/res/values-it/strings.xml b/libs/WifiTrackerLib/res/values-it/strings.xml
index 798f16a42..5108c2756 100644
--- a/libs/WifiTrackerLib/res/values-it/strings.xml
+++ b/libs/WifiTrackerLib/res/values-it/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Segnale debole. Prova ad avvicinarti al router."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"È stata superata la capacità della rete. Riprova più tardi."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Impossibile connettersi. Riprova più tardi."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Impossibile connettersi. Riprova più tardi."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Rete non compatibile con questo dispositivo"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Rete disconnessa"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Salvata"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"A consumo"</string>
diff --git a/libs/WifiTrackerLib/res/values-iw/strings.xml b/libs/WifiTrackerLib/res/values-iw/strings.xml
index c82365afe..110d0472c 100644
--- a/libs/WifiTrackerLib/res/values-iw/strings.xml
+++ b/libs/WifiTrackerLib/res/values-iw/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"אות חלש. כדאי לנסות להתקרב לנתב."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"הרשת בקיבולת יתר. יש לנסות שוב מאוחר יותר."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"לא ניתן להתחבר. יש לנסות שוב מאוחר יותר."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"לא ניתן להתחבר. יש לנסות שוב מאוחר יותר."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"הרשת לא תואמת למכשיר הזה"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"מנותקת"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"נשמרה"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"חיוב לפי שימוש בנתונים"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"בינונית"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"מהירה"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"מהירה מאוד"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"‏ה-Wi-Fi לא יתחבר באופן אוטומטי בינתיים"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-ja/strings.xml b/libs/WifiTrackerLib/res/values-ja/strings.xml
index b348fd34c..03b7d59c9 100644
--- a/libs/WifiTrackerLib/res/values-ja/strings.xml
+++ b/libs/WifiTrackerLib/res/values-ja/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"電波が安定していません。ルーターに近づいてみてください。"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"ネットワーク容量の上限を超えています。しばらくしてからもう一度お試しください。"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"接続できません。しばらくしてからもう一度お試しください。"</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"接続できません。しばらくしてからもう一度お試しください。"</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"ネットワークがこのデバイスに対応していません"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"未接続"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"保存済み"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"従量制"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"普通"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"速い"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"非常に速い"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Wi-Fi に自動接続しません"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-ka/strings.xml b/libs/WifiTrackerLib/res/values-ka/strings.xml
index 049d604e4..52ff4d108 100644
--- a/libs/WifiTrackerLib/res/values-ka/strings.xml
+++ b/libs/WifiTrackerLib/res/values-ka/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"სიგნალი სუსტია. ცადეთ როუტერთან მიახლოება."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"ქსელი გადატვირთულია. ცადეთ მოგვიანებით."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"დაკავშირება შეუძლებელია. ცადეთ მოგვიანებით."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"დაკავშირება შეუძლებელია. ცადეთ მოგვიანებით."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"ქსელი არათავსებადია ამ მოწყობილობასთან"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"კავშირი გაწყვეტილია"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"შენახული"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"ლიმიტირებული"</string>
diff --git a/libs/WifiTrackerLib/res/values-kk/strings.xml b/libs/WifiTrackerLib/res/values-kk/strings.xml
index 6559bac37..78511aed7 100644
--- a/libs/WifiTrackerLib/res/values-kk/strings.xml
+++ b/libs/WifiTrackerLib/res/values-kk/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Сигнал әлсіз. Құрылғыны маршрутизаторға жақындатып көріңіз."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Желінің өткізу қабілеті шектен асып кетті. Кейінірек қайталап көріңіз."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Қосылу мүмкін емес. Кейінірек қайталап көріңіз."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Қосылу мүмкін емес. Кейінірек қайталап көріңіз."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Желі бұл құрылғымен үйлесімді емес."</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Ажыратылды"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Сақталған"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Трафик саналатын желі"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Орташа"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Жылдам"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Өте жылдам"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Қазір Wi-Fi автоматты түрде қосылмайды."</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-km/strings.xml b/libs/WifiTrackerLib/res/values-km/strings.xml
index 0fc0db197..0e815e7a2 100644
--- a/libs/WifiTrackerLib/res/values-km/strings.xml
+++ b/libs/WifiTrackerLib/res/values-km/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"រលកសញ្ញាខ្សោយ។ សូមសាកល្បងខិតឱ្យកាន់តែជិតរ៉ោទ័រ។"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"បណ្ដាលកំពុងដំណើរការហួសសមត្ថភាព។ សូមព្យាយាមម្តងទៀតនៅពេលក្រោយ។"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"មិនអាចភ្ជាប់បានទេ។ សូមព្យាយាមម្តងទៀតនៅពេលក្រោយ។"</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"មិនអាចភ្ជាប់បានទេ។ សូមព្យាយាមម្តងទៀតនៅពេលក្រោយ។"</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"បណ្ដាញមិនត្រូវគ្នាជាមួយឧបករណ៍នេះទេ"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"បានផ្ដាច់"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"បានរក្សាទុក"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"ផ្អែកតាមទិន្នន័យដែលប្រើ"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"មធ្យម"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"លឿន"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"លឿនណាស់"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Wi-Fi នឹងមិនភ្ជាប់ដោយស្វ័យប្រវត្តិក្នុងពេលនេះទេ"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-kn/strings.xml b/libs/WifiTrackerLib/res/values-kn/strings.xml
index 01712ad59..1a77c6cb1 100644
--- a/libs/WifiTrackerLib/res/values-kn/strings.xml
+++ b/libs/WifiTrackerLib/res/values-kn/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"ದುರ್ಬಲ ಸಿಗ್ನಲ್. ರೂಟರ್‌ನ ಹತ್ತಿರ ಹೋಗಿ ಕನೆಕ್ಟ್ ಮಾಡಿ ನೋಡಿ."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"ನೆಟ್‌ವರ್ಕ್ ಸಾಮರ್ಥ್ಯದ ಮಿತಿ ಮೀರಿದೆ. ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ನಂತರ ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"ಈ ಸಾಧನದ ಜೊತೆ ನೆಟ್‌ವರ್ಕ್ ಹೊಂದಾಣಿಕೆಯಾಗುವುದಿಲ್ಲ"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"ಉಳಿಸಲಾಗಿದೆ"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"ಮೀಟರ್ ಮಾಡಲಾಗಿದೆ"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"ಮಧ್ಯಮ"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"ವೇಗ"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"ಬಹಳ ವೇಗವಾಗಿದೆ"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"ಇದೀಗ ವೈ-ಫೈ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಕನೆಕ್ಟ್ ಆಗುವುದಿಲ್ಲ"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-ko/strings.xml b/libs/WifiTrackerLib/res/values-ko/strings.xml
index a68585d40..ad334bf70 100644
--- a/libs/WifiTrackerLib/res/values-ko/strings.xml
+++ b/libs/WifiTrackerLib/res/values-ko/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"신호가 약합니다. 라우터 가까이 이동해 보세요."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"네트워크 용량을 초과했습니다. 나중에 다시 시도해 주세요."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"연결할 수 없습니다. 나중에 다시 시도해 주세요."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"연결할 수 없습니다. 나중에 다시 시도해 주세요."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"네트워크가 이 기기와 호환되지 않습니다."</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"연결 해제됨"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"저장됨"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"종량제"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"보통"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"빠름"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"매우 빠름"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"지금은 Wi-Fi가 자동으로 연결되지 않습니다."</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-ky/strings.xml b/libs/WifiTrackerLib/res/values-ky/strings.xml
index dc9b2e386..f9cc10774 100644
--- a/libs/WifiTrackerLib/res/values-ky/strings.xml
+++ b/libs/WifiTrackerLib/res/values-ky/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Начар сигнал. Роутерге жакын жылып көрүңүз."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Тармакка өтө көп түзмөк туташып турат. Кайталаңыз."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Туташпай жатат. Кайталаңыз."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Туташпай жатат. Кайталаңыз."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Тармак бул түзмөк менен шайкеш келбейт"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Ажыратылды"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Сакталды"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Трафик ченелет"</string>
@@ -41,7 +41,7 @@
     <string name="wifitrackerlib_connected_via_network_scorer_default" msgid="3436792128688839692">"Тармактар рейтингинин булагы аркылуу автоматтык түрдө туташты"</string>
     <string name="wifitrackerlib_wifi_limited_connection" msgid="4234326409980991740">"Байланыш чектелген"</string>
     <string name="wifitrackerlib_private_dns_broken" msgid="6049401148262718707">"Жеке DNS сервери жеткиликсиз"</string>
-    <string name="wifitrackerlib_wifi_connected_cannot_provide_internet" msgid="3803471522215612745">"Түзмөккө туташып турат. Интернет жок."</string>
+    <string name="wifitrackerlib_wifi_connected_cannot_provide_internet" msgid="3803471522215612745">"Түзмөккө туташты. Интернет жок."</string>
     <string name="wifi_connected_low_quality" msgid="4478331645458058445">"Начар сапат"</string>
     <string name="wifitrackerlib_wifi_security_none" msgid="2686062484642847280">"Жок"</string>
     <string name="wifitrackerlib_wifi_passpoint_expired" msgid="7974960573887452566">"Мөөнөтү бүткөн"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Орто"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Ылдам"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Абдан ылдам"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Wi-Fi азырынча автоматтык түрдө туташпайт"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-lo/strings.xml b/libs/WifiTrackerLib/res/values-lo/strings.xml
index 7ae67bec1..0269e2244 100644
--- a/libs/WifiTrackerLib/res/values-lo/strings.xml
+++ b/libs/WifiTrackerLib/res/values-lo/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"ສັນຍານອ່ອນ. ລອງຍ້າຍໄປໃກ້ເຣົາເຕີ."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"ເກີນຄວາມຈຸເຄືອຂ່າຍແລ້ວ. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"ບໍ່ສາມາດເຊື່ອມຕໍ່ໄດ້. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"ບໍ່ສາມາດເຊື່ອມຕໍ່ໄດ້. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"ເຄືອຂ່າຍບໍ່ສາມາດໃຊ້ຮ່ວມກັບອຸປະກອນນີ້ໄດ້"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"ຕັດການເຊື່ອມຕໍ່ແລ້ວ"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"ບັນທຶກແລ້ວ"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"ມີການວັດແທກ"</string>
diff --git a/libs/WifiTrackerLib/res/values-lt/strings.xml b/libs/WifiTrackerLib/res/values-lt/strings.xml
index ae6dc6d1e..7ac6c6580 100644
--- a/libs/WifiTrackerLib/res/values-lt/strings.xml
+++ b/libs/WifiTrackerLib/res/values-lt/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Silpnas signalas. Pabandykite prieiti arčiau maršruto parinktuvo."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Tinklas pernelyg užimtas. Vėliau bandykite dar kartą."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Nepavyko prisijungti. Vėliau bandykite dar kartą."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Nepavyko prisijungti. Vėliau bandykite dar kartą."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Tinklas nesuderinamas su šiuo įrenginiu"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Atsijungta"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Išsaugota"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Matuojamas"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Vidutinis"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Spartus"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Labai spartus"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"„Wi-Fi“ šiuo metu nebus prijungtas automatiškai"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-lv/strings.xml b/libs/WifiTrackerLib/res/values-lv/strings.xml
index 5f706d904..ee921d9cb 100644
--- a/libs/WifiTrackerLib/res/values-lv/strings.xml
+++ b/libs/WifiTrackerLib/res/values-lv/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Vājš signāls. Pārvietojieties tuvāk maršrutētājam."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Tīkls ir pārslogots. Vēlāk mēģiniet vēlreiz."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Nevar izveidot savienojumu. Vēlāk mēģiniet vēlreiz."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Nevar izveidot savienojumu. Vēlāk mēģiniet vēlreiz."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Tīkls nav saderīgs ar šo ierīci."</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Savienojums pārtraukts"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Saglabāts"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Maksas"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Vidējs"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Ātrs"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Ļoti ātrs"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Wi-Fi savienojums īslaicīgi netiks veidots automātiski"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-mk/strings.xml b/libs/WifiTrackerLib/res/values-mk/strings.xml
index d0dd758ef..d21ea7a1b 100644
--- a/libs/WifiTrackerLib/res/values-mk/strings.xml
+++ b/libs/WifiTrackerLib/res/values-mk/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Слаб сигнал. Доближете се до рутерот."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Мрежата е преоптоварена. Обидете се повторно подоцна."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Не може да се поврзе. Обидете се повторно подоцна."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Не може да се поврзе. Обидете се повторно подоцна."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Мрежата не е компатибилна со уредов"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Не е поврзано"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Зачувана"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Со ограничен интернет"</string>
diff --git a/libs/WifiTrackerLib/res/values-ml/strings.xml b/libs/WifiTrackerLib/res/values-ml/strings.xml
index b39326d6d..1fce76ced 100644
--- a/libs/WifiTrackerLib/res/values-ml/strings.xml
+++ b/libs/WifiTrackerLib/res/values-ml/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"സിഗ്‌നൽ ദുർബലമാണ്. റൂട്ടറിന് കൂടുതൽ അടുത്തേക്ക് നീക്കി ശ്രമിക്കുക."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"നിങ്ങളുടെ നെറ്റ്‌വർക്ക് ശേഷി കവിഞ്ഞു. പിന്നീട് വീണ്ടും ശ്രമിക്കുക."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"കണക്‌റ്റ് ചെയ്യാനാകുന്നില്ല. പിന്നീട് വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"കണക്റ്റ് ചെയ്യാനാകുന്നില്ല. പിന്നീട് വീണ്ടും ശ്രമിക്കുക."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"നെറ്റ്‌വർക്ക് ഈ ഉപകരണവുമായി പൊരുത്തപ്പെടുന്നില്ല"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"വിച്ഛേദിച്ചു"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"സംരക്ഷിച്ചു"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"മീറ്റർ ചെയ്‌തത്"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"ഇടത്തരം"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"വേഗത്തിൽ"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"അതിവേഗം"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"വൈഫൈ ഇപ്പോൾ സ്വയമേവ കണക്റ്റ് ചെയ്യില്ല"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-mn/strings.xml b/libs/WifiTrackerLib/res/values-mn/strings.xml
index fe99e1a59..95eeeb31c 100644
--- a/libs/WifiTrackerLib/res/values-mn/strings.xml
+++ b/libs/WifiTrackerLib/res/values-mn/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Дохио сул байна. Рүүтэр лүүгээ ойртож үзнэ үү."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Сүлжээний хүчин чадал хэтэрсэн байна. Дараа дахин оролдоно уу."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Холбогдох боломжгүй байна. Дараа дахин оролдоно уу."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Холбогдох боломжгүй байна. Дараа дахин оролдоно уу."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Сүлжээ энэ төхөөрөмжтэй тохиромжгүй байна"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Салгасан"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Хадгалсан"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Хязгаартай"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Дундаж"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Хурдан"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Маш хурдан"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Wi-Fi одоогоор автоматаар холбогдохгүй"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-mr/strings.xml b/libs/WifiTrackerLib/res/values-mr/strings.xml
index ca9d19ed7..7103329f8 100644
--- a/libs/WifiTrackerLib/res/values-mr/strings.xml
+++ b/libs/WifiTrackerLib/res/values-mr/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"कमकुवत सिग्नल. राउटरच्‍या जवळ जाण्याचा प्रयत्‍न करा."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"नेटवर्कवर क्षमतेपेक्षा जास्त लोड आहे. नंतर पुन्हा प्रयत्न करा."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"कनेक्ट करू शकत नाही. नंतर पुन्हा प्रयत्न करा."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"कनेक्ट करू शकत नाही. नंतर पुन्हा प्रयत्न करा."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"नेटवर्क या डिव्हाइससह सुसंगत नाही"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"डिस्कनेक्ट केले"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"सेव्ह केलेले"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"मर्यादित आहे"</string>
diff --git a/libs/WifiTrackerLib/res/values-ms/strings.xml b/libs/WifiTrackerLib/res/values-ms/strings.xml
index 655df3bbb..f0d354db2 100644
--- a/libs/WifiTrackerLib/res/values-ms/strings.xml
+++ b/libs/WifiTrackerLib/res/values-ms/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Isyarat lemah. Cuba bergerak lebih rapat ke penghala."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Rangkaian melebihi kapasiti. Cuba lagi nanti."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Tidak dapat menyambung. Cuba lagi nanti."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Tidak dapat menyambung. Cuba lagi nanti."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Rangkaian tidak serasi dengan peranti ini"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Diputuskan sambungan"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Disimpan"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Bermeter"</string>
diff --git a/libs/WifiTrackerLib/res/values-my/strings.xml b/libs/WifiTrackerLib/res/values-my/strings.xml
index 827147eff..d6e0873a5 100644
--- a/libs/WifiTrackerLib/res/values-my/strings.xml
+++ b/libs/WifiTrackerLib/res/values-my/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"အချက်ပြမှု အားနည်းသည်။ ရောက်တာအနီးသို့ ရွှေ့ကြည့်ပါ။"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"ကွန်ရက်က လက်ခံနိုင်စွမ်းကို ကျော်လွန်နေသည်။ နောက်မှ ထပ်စမ်းကြည့်ပါ။"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"ချိတ်ဆက်၍ မရပါ။ နောက်မှ ထပ်စမ်းကြည့်ပါ။"</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"ချိတ်ဆက်၍ မရပါ။ နောက်မှ ထပ်စမ်းကြည့်ပါ။"</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"ကွန်ရက်က ဤစက်ပစ္စည်းနှင့် တွဲဖက်မသုံးနိုင်ပါ"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"ချိတ်ဆက်မထားပါ"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"သိမ်းပြီးပါပြီ"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"အခမဲ့ မဟုတ်ပါ"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"အလယ်အလတ်"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"အမြန်"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"အလွန်မြန်"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Wi-Fi က ယခု အလိုအလျောက် ချိတ်ဆက်မည်မဟုတ်ပါ"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-nb/strings.xml b/libs/WifiTrackerLib/res/values-nb/strings.xml
index d7fd60f98..5d45a5025 100644
--- a/libs/WifiTrackerLib/res/values-nb/strings.xml
+++ b/libs/WifiTrackerLib/res/values-nb/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Svakt signal. Prøv å flytte deg nærmere ruteren."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Nettverket er over kapasitet. Prøv igjen senere."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Kan ikke koble til. Prøv igjen senere."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Kan ikke koble til. Prøv igjen senere."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Nettverket er ikke kompatibelt med denne enheten"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Frakoblet"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Lagret"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Med datamåling"</string>
diff --git a/libs/WifiTrackerLib/res/values-ne/arrays.xml b/libs/WifiTrackerLib/res/values-ne/arrays.xml
index 192875b18..0c4516234 100644
--- a/libs/WifiTrackerLib/res/values-ne/arrays.xml
+++ b/libs/WifiTrackerLib/res/values-ne/arrays.xml
@@ -29,7 +29,7 @@
     <item msgid="5450920562291300229">"कनेक्ट गरिएको छ"</item>
     <item msgid="6332116533879646145">"निलम्बन गरियो"</item>
     <item msgid="294459081501073818">"डिस्कनेक्ट गर्दै…"</item>
-    <item msgid="1577368920272598676">"डिस्कनेक्ट गरिएको छ"</item>
+    <item msgid="1577368920272598676">"डिस्कनेक्ट गरियो"</item>
     <item msgid="7655843177582495451">"Wi-Fi कनेक्ट गर्न सकिएन"</item>
     <item msgid="8953752690917593623">"रोक लगाइयो"</item>
     <item msgid="4400457817750243671">"केही समयका लागि कमजोर इन्टरनेटलाई बेवास्ता गर्दै"</item>
diff --git a/libs/WifiTrackerLib/res/values-ne/strings.xml b/libs/WifiTrackerLib/res/values-ne/strings.xml
index a1546a21f..b84bcab2a 100644
--- a/libs/WifiTrackerLib/res/values-ne/strings.xml
+++ b/libs/WifiTrackerLib/res/values-ne/strings.xml
@@ -30,9 +30,9 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"सिग्नल कमजोर छ। राउटरको नजिकै गई हेर्नुहोस्।"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"नेटवर्कमा अत्यधिक लोड छ। पछि फेरि प्रयास गर्नुहोस्।"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"कनेक्ट गर्न सकिएन। पछि फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"कनेक्ट गर्न सकिएन। पछि फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"डिस्कनेक्ट गरिएको छ"</string>
-    <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"सेभ गरिएको छ"</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"यो डिभाइससँग नेटवर्क कम्प्याटिबल छैन"</string>
+    <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"डिस्कनेक्ट गरियो"</string>
+    <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"सेभ गरियो"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"सीमा तोकिएको इन्टरनेट"</string>
     <string name="wifitrackerlib_wifi_unmetered_label" msgid="1902150402929678469">"सीमा हटाइएको छ"</string>
     <string name="wifitrackerlib_connected_via_app" msgid="7823921840931347560">"<xliff:g id="NAME">%1$s</xliff:g> मार्फत कनेक्ट गरियो"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"मध्यम"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"छिटो"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"धेरै छिटो"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"केही समयका लागि Wi-Fi स्वतः कनेक्ट हुँदैन"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-nl/strings.xml b/libs/WifiTrackerLib/res/values-nl/strings.xml
index c4d4cbd45..f5a42e418 100644
--- a/libs/WifiTrackerLib/res/values-nl/strings.xml
+++ b/libs/WifiTrackerLib/res/values-nl/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Zwak signaal. Ga dichter naar de router toe."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Netwerk is overbelast. Probeer het later opnieuw."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Kan geen verbinding maken. Probeer het later opnieuw."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Kan geen verbinding maken. Probeer het later opnieuw."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Netwerk niet geschikt voor dit apparaat"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Verbinding verbroken"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Opgeslagen"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Met datalimiet"</string>
diff --git a/libs/WifiTrackerLib/res/values-or/strings.xml b/libs/WifiTrackerLib/res/values-or/strings.xml
index 2f7a6299e..ab2411b08 100644
--- a/libs/WifiTrackerLib/res/values-or/strings.xml
+++ b/libs/WifiTrackerLib/res/values-or/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"ସିଗନାଲ୍ ଦୁର୍ବଳ ଅଟେ। ରାଉଟର୍ ପାଖକୁ ଯାଇ ଦେଖନ୍ତୁ।"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"ନେଟୱାର୍କ କ୍ଷମତାର ସର୍ବାଧିକ ସୀମାରେ ପହଞ୍ଚିଯାଇଛି। ପରେ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"ସଂଯୋଗ କରାଯାଇପାରିବ ନାହିଁ। ପରେ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"ସଂଯୋଗ କରାଯାଇପାରିବ ନାହିଁ। ପରେ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"ନେଟୱାର୍କ ଏହି ଡିଭାଇସ୍ ସହିତ ସୁସଙ୍ଗତ ନୁହେଁ"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"ବିଚ୍ଛିନ୍ନ କରାଯାଇଛି"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"ସେଭ୍ କରାଯାଇଛି"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"ମିଟର ହୋଇଥିବା"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"ମଧ୍ୟମ"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"ଦ୍ରୁତ"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"ଅତି ଦ୍ରୁତ"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"ବର୍ତ୍ତମାନ ପାଇଁ ୱାଇ-ଫାଇ ସ୍ୱତଃ-ସଂଯୋଗ ହେବ ନାହିଁ"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-pa/arrays.xml b/libs/WifiTrackerLib/res/values-pa/arrays.xml
index 3f469e5a8..012906034 100644
--- a/libs/WifiTrackerLib/res/values-pa/arrays.xml
+++ b/libs/WifiTrackerLib/res/values-pa/arrays.xml
@@ -29,7 +29,7 @@
     <item msgid="5450920562291300229">"ਕਨੈਕਟ ਹੈ"</item>
     <item msgid="6332116533879646145">"ਮੁਅੱਤਲ ਕੀਤਾ"</item>
     <item msgid="294459081501073818">"ਡਿਸਕਨੈਕਟ ਹੋ ਰਿਹਾ ਹੈ…"</item>
-    <item msgid="1577368920272598676">"ਡਿਸਕਨੈਕਟ ਕੀਤਾ"</item>
+    <item msgid="1577368920272598676">"ਡਿਸਕਨੈਕਟ ਹੋਇਆ"</item>
     <item msgid="7655843177582495451">"ਅਸਫਲ"</item>
     <item msgid="8953752690917593623">"ਬਲਾਕ ਕੀਤਾ ਗਿਆ"</item>
     <item msgid="4400457817750243671">"ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਖਰਾਬ ਕਨੈਕਸ਼ਨ ਤੋਂ ਬਚਣ ਲਈ"</item>
diff --git a/libs/WifiTrackerLib/res/values-pa/strings.xml b/libs/WifiTrackerLib/res/values-pa/strings.xml
index 4d5efb0ad..2346a44e6 100644
--- a/libs/WifiTrackerLib/res/values-pa/strings.xml
+++ b/libs/WifiTrackerLib/res/values-pa/strings.xml
@@ -30,8 +30,8 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"ਕਮਜ਼ੋਰ ਸਿਗਨਲ। ਰਾਊਟਰ ਦੇ ਨਜ਼ਦੀਕ ਜਾ ਕੇ ਦੇਖੋ।"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"ਨੈੱਟਵਰਕ ਦੀ ਸਮਰੱਥਾ ਪੂਰੀ ਹੋ ਗਈ ਹੈ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"ਡਿਸਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"ਨੈੱਟਵਰਕ ਇਸ ਡੀਵਾਈਸ ਦੇ ਅਨੁਰੂਪ ਨਹੀਂ ਹੈ"</string>
+    <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"ਡਿਸਕਨੈਕਟ ਹੋਇਆ"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"ਰੱਖਿਅਤ ਕੀਤਾ ਗਿਆ"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"ਮੀਟਰਬੱਧ ਕੀਤਾ ਗਿਆ"</string>
     <string name="wifitrackerlib_wifi_unmetered_label" msgid="1902150402929678469">"ਗੈਰ-ਮੀਟਰਬੱਧ ਕੀਤਾ ਗਿਆ"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"ਮੱਧਮ"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"ਤੇਜ਼"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"ਬਹੁਤ ਤੇਜ਼"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"ਫ਼ਿਲਹਾਲ ਵਾਈ-ਫਾਈ ਸਵੈ-ਕਨੈਕਟ ਨਹੀਂ ਹੋਵੇਗਾ"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-pl/strings.xml b/libs/WifiTrackerLib/res/values-pl/strings.xml
index 3d56bc7e5..9bf50c6fd 100644
--- a/libs/WifiTrackerLib/res/values-pl/strings.xml
+++ b/libs/WifiTrackerLib/res/values-pl/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Słaby sygnał. Przysuń się do routera."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Sieć jest przeciążona. Spróbuj ponownie później."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Nie udało się połączyć. Spróbuj ponownie później."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Nie udało się połączyć. Spróbuj ponownie później."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Sieć niezgodna z tym urządzeniem"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Odłączono"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Zapisano"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Użycie danych jest mierzone"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Średnia"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Szybka"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Bardzo szybka"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Wi-Fi nie będzie na razie włączać się automatycznie"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-pt-rBR/strings.xml b/libs/WifiTrackerLib/res/values-pt-rBR/strings.xml
index 19357b51c..b4f7e3ae0 100644
--- a/libs/WifiTrackerLib/res/values-pt-rBR/strings.xml
+++ b/libs/WifiTrackerLib/res/values-pt-rBR/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"O sinal está fraco. Tente se aproximar do roteador."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"A rede está sobrecarregada. Tente novamente mais tarde."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Não foi possível conectar. Tente novamente mais tarde."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Não foi possível conectar. Tente novamente mais tarde."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"A rede não é compatível com este dispositivo"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Desconectada"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Salva"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Limitada"</string>
diff --git a/libs/WifiTrackerLib/res/values-pt-rPT/strings.xml b/libs/WifiTrackerLib/res/values-pt-rPT/strings.xml
index 6f80eb9ac..80aeb19bd 100644
--- a/libs/WifiTrackerLib/res/values-pt-rPT/strings.xml
+++ b/libs/WifiTrackerLib/res/values-pt-rPT/strings.xml
@@ -30,9 +30,9 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Sinal fraco. Experimente aproximar-se do router."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"A capacidade da rede foi excedida. Tente novamente mais tarde."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Não é possível ligar. Tente novamente mais tarde."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Não é possível ligar. Tente novamente mais tarde."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"A rede não é compatível com este dispositivo"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Desligada"</string>
-    <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Guardada"</string>
+    <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Guardada."</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Com acesso limitado"</string>
     <string name="wifitrackerlib_wifi_unmetered_label" msgid="1902150402929678469">"Com acesso ilimitado"</string>
     <string name="wifitrackerlib_connected_via_app" msgid="7823921840931347560">"Ligado através de <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -44,7 +44,7 @@
     <string name="wifitrackerlib_wifi_connected_cannot_provide_internet" msgid="3803471522215612745">"Ligado ao dispositivo. Não é possível disponibilizar Internet."</string>
     <string name="wifi_connected_low_quality" msgid="4478331645458058445">"Baixa qualidade"</string>
     <string name="wifitrackerlib_wifi_security_none" msgid="2686062484642847280">"Nenhuma"</string>
-    <string name="wifitrackerlib_wifi_passpoint_expired" msgid="7974960573887452566">"Expirado"</string>
+    <string name="wifitrackerlib_wifi_passpoint_expired" msgid="7974960573887452566">"Expirado."</string>
     <string name="wifitrackerlib_tap_to_sign_up" msgid="3897017015910817402">"Toque para se inscrever."</string>
     <string name="wifitrackerlib_tap_to_renew_subscription_and_connect" msgid="6048420776676138069">"Toque para renovar a subscrição e estabelecer ligação."</string>
     <string name="wifitrackerlib_osu_opening_provider" msgid="7128677439450712558">"A abrir <xliff:g id="PASSPOINTPROVIDER">%1$s</xliff:g>…"</string>
diff --git a/libs/WifiTrackerLib/res/values-pt/strings.xml b/libs/WifiTrackerLib/res/values-pt/strings.xml
index 19357b51c..b4f7e3ae0 100644
--- a/libs/WifiTrackerLib/res/values-pt/strings.xml
+++ b/libs/WifiTrackerLib/res/values-pt/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"O sinal está fraco. Tente se aproximar do roteador."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"A rede está sobrecarregada. Tente novamente mais tarde."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Não foi possível conectar. Tente novamente mais tarde."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Não foi possível conectar. Tente novamente mais tarde."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"A rede não é compatível com este dispositivo"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Desconectada"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Salva"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Limitada"</string>
diff --git a/libs/WifiTrackerLib/res/values-ro/strings.xml b/libs/WifiTrackerLib/res/values-ro/strings.xml
index 8f081c8be..0ae9a3a44 100644
--- a/libs/WifiTrackerLib/res/values-ro/strings.xml
+++ b/libs/WifiTrackerLib/res/values-ro/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Semnal slab. Apropiați-vă de router."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Capacitatea rețelei a fost depășită. Încercați din nou mai târziu."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Nu se poate conecta. Încercați din nou mai târziu."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Nu se poate conecta. Reîncercați mai târziu."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Rețeaua nu este compatibilă cu dispozitivul"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Deconectată"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Salvată"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Contorizată"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Medie"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Rapidă"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Foarte rapidă"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Deocamdată, Wi-Fi nu se poate conecta automat"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-ru/strings.xml b/libs/WifiTrackerLib/res/values-ru/strings.xml
index 5563e1da9..a02136664 100644
--- a/libs/WifiTrackerLib/res/values-ru/strings.xml
+++ b/libs/WifiTrackerLib/res/values-ru/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Слабый сигнал. Попробуйте разместить устройство ближе к роутеру."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Превышена пропускная способность сети. Повторите попытку позже."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Ошибка подключения. Повторите попытку позже."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Ошибка подключения. Повторите попытку позже."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Сеть несовместима с этим устройством."</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Не подключено"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Сохранено"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Сеть с тарификацией трафика"</string>
@@ -41,7 +41,7 @@
     <string name="wifitrackerlib_connected_via_network_scorer_default" msgid="3436792128688839692">"Автоматически подключено через автора рейтинга сетей"</string>
     <string name="wifitrackerlib_wifi_limited_connection" msgid="4234326409980991740">"Подключение к сети ограничено"</string>
     <string name="wifitrackerlib_private_dns_broken" msgid="6049401148262718707">"Доступа к частному DNS-серверу нет"</string>
-    <string name="wifitrackerlib_wifi_connected_cannot_provide_internet" msgid="3803471522215612745">"Подключено к устройству. Нет доступа к интернету."</string>
+    <string name="wifitrackerlib_wifi_connected_cannot_provide_internet" msgid="3803471522215612745">"Подключено к устройству. Нет доступа к Интернету."</string>
     <string name="wifi_connected_low_quality" msgid="4478331645458058445">"низкое качество"</string>
     <string name="wifitrackerlib_wifi_security_none" msgid="2686062484642847280">"Нет"</string>
     <string name="wifitrackerlib_wifi_passpoint_expired" msgid="7974960573887452566">"Срок действия истек"</string>
diff --git a/libs/WifiTrackerLib/res/values-si/strings.xml b/libs/WifiTrackerLib/res/values-si/strings.xml
index 4db942388..322a295c6 100644
--- a/libs/WifiTrackerLib/res/values-si/strings.xml
+++ b/libs/WifiTrackerLib/res/values-si/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"දුර්වල සංඥා. රවුටරය වෙත වඩාත් සමීප වීමට උත්සාහ කරන්න."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"ජාලයේ ධාරිතාව ඉක්මවා ඇත. පසුව නැවත උත්සාහ කරන්න."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"සම්බන්ධ විය නොහැකිය. පසුව නැවත උත්සාහ කරන්න."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"සම්බන්ධ විය නොහැකිය. පසුව නැවත උත්සාහ කරන්න."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"ජාලය මෙම උපාංගය සමඟ නොගැළපේ"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"විසන්ධි විය"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"සුරකින ලදි"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"මනුගත"</string>
diff --git a/libs/WifiTrackerLib/res/values-sk/strings.xml b/libs/WifiTrackerLib/res/values-sk/strings.xml
index 0996784af..7bb21280d 100644
--- a/libs/WifiTrackerLib/res/values-sk/strings.xml
+++ b/libs/WifiTrackerLib/res/values-sk/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Slabý signál. Skúste sa priblížiť k smerovaču."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Bola prekročená kapacita siete. Skúste to neskôr."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Nedá sa pripojiť. Skúste to neskôr."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Nedá sa pripojiť. Skúste to neskôr."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Sieť nie je kompatibilná s týmto zariadením"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Odpojené"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Uložené"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Merané"</string>
diff --git a/libs/WifiTrackerLib/res/values-sl/strings.xml b/libs/WifiTrackerLib/res/values-sl/strings.xml
index d481c0ddb..5599ef63f 100644
--- a/libs/WifiTrackerLib/res/values-sl/strings.xml
+++ b/libs/WifiTrackerLib/res/values-sl/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Šibek signal. Poskusite se premakniti bliže k usmerjevalniku."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Omrežje je prezasedeno. Poskusite znova pozneje."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Povezave ni mogoče vzpostaviti. Poskusite znova pozneje."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Povezave ni mogoče vzpostaviti. Poskusite znova pozneje."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Omrežje ni združljivo s to napravo."</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Ni povezave"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Shranjeno"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Z omejenim prenosom podatkov"</string>
diff --git a/libs/WifiTrackerLib/res/values-sq/strings.xml b/libs/WifiTrackerLib/res/values-sq/strings.xml
index 96f4f6f09..0e7e3f417 100644
--- a/libs/WifiTrackerLib/res/values-sq/strings.xml
+++ b/libs/WifiTrackerLib/res/values-sq/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Sinjal i dobët. Provo të lëvizësh më pranë ruterit."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Rrjeti është mbi kapacitet Provo sërish më vonë."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Nuk mund të lidhet. Provo sërish më vonë."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Nuk mund të lidhet. Provo sërish më vonë."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Rrjeti nuk është i pajtueshëm me këtë pajisje"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Shkëputur"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Ruajtur"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Me matje"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Mesatare"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"E shpejtë"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Shumë e shpejtë"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Wi-Fi nuk do të lidhet automatikisht për momentin"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-sr/strings.xml b/libs/WifiTrackerLib/res/values-sr/strings.xml
index c794bc047..c519f3451 100644
--- a/libs/WifiTrackerLib/res/values-sr/strings.xml
+++ b/libs/WifiTrackerLib/res/values-sr/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Слаб сигнал. Пробајте да се приближите рутеру."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Капацитет мреже је премашен. Пробајте поново касније."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Повезивање није успело. Пробајте поново касније."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Повезивање није успело. Пробајте поново касније."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Мрежа није компатибилна са овим уређајем"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Веза је прекинута"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Сачувано"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Са ограничењем"</string>
diff --git a/libs/WifiTrackerLib/res/values-sv/strings.xml b/libs/WifiTrackerLib/res/values-sv/strings.xml
index d4c5e018e..89caf5cd3 100644
--- a/libs/WifiTrackerLib/res/values-sv/strings.xml
+++ b/libs/WifiTrackerLib/res/values-sv/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Svag signal. Gå närmare routern."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Nätverket är överbelastat. Försök igen senare."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Det gick inte att ansluta. Försök igen senare."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Det gick inte att ansluta. Försök igen senare."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Nätverket är inte kompatibelt med denna enhet"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Frånkopplad"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Sparat"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Med datapriser"</string>
@@ -59,5 +59,5 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Medel"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Snabb"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Mycket snabb"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Du ansluts inte till wifi automatiskt för närvarande"</string>
+    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Du ansluts inte till Wi-Fi automatiskt för närvarande"</string>
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-sw/strings.xml b/libs/WifiTrackerLib/res/values-sw/strings.xml
index fce858b54..7981cc9d5 100644
--- a/libs/WifiTrackerLib/res/values-sw/strings.xml
+++ b/libs/WifiTrackerLib/res/values-sw/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Muunganisho si thabiti. Jaribu kusogea karibu na kisambaza data."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Kuna msongamano kwenye mtandao. Jaribu tena baadaye."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Imeshindwa kuunganisha. Jaribu tena baadaye."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Imeshindwa kuunganisha. Jaribu tena baadaye."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Mtandao hauoani na kifaa hiki"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Imetenganishwa"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Uliohifadhiwa"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Mtandao unaopima data"</string>
@@ -41,7 +41,7 @@
     <string name="wifitrackerlib_connected_via_network_scorer_default" msgid="3436792128688839692">"Imeunganishwa kiotomatiki kupitia kampuni ya kukadiria mitandao"</string>
     <string name="wifitrackerlib_wifi_limited_connection" msgid="4234326409980991740">"Muunganisho hafifu"</string>
     <string name="wifitrackerlib_private_dns_broken" msgid="6049401148262718707">"Seva ya faragha ya DNS haiwezi kufikiwa"</string>
-    <string name="wifitrackerlib_wifi_connected_cannot_provide_internet" msgid="3803471522215612745">"Kifaa kimeunganishwa. Imeshindwa kusambaza intaneti."</string>
+    <string name="wifitrackerlib_wifi_connected_cannot_provide_internet" msgid="3803471522215612745">"Imeunganishwa kwenye kifaa. Imeshindwa kusambaza intaneti."</string>
     <string name="wifi_connected_low_quality" msgid="4478331645458058445">"Ubora wa chini"</string>
     <string name="wifitrackerlib_wifi_security_none" msgid="2686062484642847280">"Hamna"</string>
     <string name="wifitrackerlib_wifi_passpoint_expired" msgid="7974960573887452566">"Muda wake umeisha"</string>
diff --git a/libs/WifiTrackerLib/res/values-ta/strings.xml b/libs/WifiTrackerLib/res/values-ta/strings.xml
index c718787de..4d4606289 100644
--- a/libs/WifiTrackerLib/res/values-ta/strings.xml
+++ b/libs/WifiTrackerLib/res/values-ta/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"வலுவற்ற சிக்னல். ரூட்டருக்கு அருகில் சென்று சிக்னல் வலுவாகக் கிடைக்கிறதா எனப் பாருங்கள்."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"நெட்வொர்க் பிசியாக உள்ளது. பிறகு முயலவும்."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"இணைக்க முடியவில்லை. பிறகு முயலவும்."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"இணைக்க முடியவில்லை. பிறகு முயலவும்."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"இந்தச் சாதனத்துடன் நெட்வொர்க் இணங்கவில்லை"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"தொடர்பு துண்டிக்கப்பட்டது"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"சேமித்தது"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"கட்டண நெட்வொர்க்"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"நடுத்தரம்"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"வேகமானது"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"மிகவும் வேகமானது"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"இப்போது வைஃபை தானாக இணைக்கப்படாது"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-te/strings.xml b/libs/WifiTrackerLib/res/values-te/strings.xml
index c5b05b7b7..5699ef78e 100644
--- a/libs/WifiTrackerLib/res/values-te/strings.xml
+++ b/libs/WifiTrackerLib/res/values-te/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"పేలవమైన సిగ్నల్. రూటర్‌కు కొద్దిగా దగ్గరికి వెళ్ళడానికి ట్రై చేయండి."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"నెట్‌వర్క్ సామర్థ్యం మించిపోయింది. తర్వాత మళ్లీ ట్రై చేయండి."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"కనెక్ట్ చేయడం సాధ్యపడదు. తర్వాత మళ్లీ ట్రై చేయండి."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"కనెక్ట్ చేయడం సాధ్యపడదు. తర్వాత మళ్లీ ట్రై చేయండి."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"నెట్‌వర్క్ ఈ పరికరంతో అనుకూలంగా లేదు"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"డిస్‌కనెక్ట్ అయింది"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"సేవ్ అయింది"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"గణించబడింది"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"మధ్యస్థం"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"వేగవంతం"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"చాలా వేగవంతం"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"ప్రస్తుతానికి Wi-Fi ఆటోమేటిక్‌గా కనెక్ట్ అవ్వదు"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-th/strings.xml b/libs/WifiTrackerLib/res/values-th/strings.xml
index f8b2d5f46..59853106f 100644
--- a/libs/WifiTrackerLib/res/values-th/strings.xml
+++ b/libs/WifiTrackerLib/res/values-th/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"สัญญาณไม่ดี ลองเข้าไปใกล้กับเราเตอร์"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"มีการใช้งานเครือข่ายเกินความจุ ลองอีกครั้งในภายหลัง"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"เชื่อมต่อไม่ได้ ลองอีกครั้งในภายหลัง"</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"เชื่อมต่อไม่ได้ ลองอีกครั้งในภายหลัง"</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"เครือข่ายใช้งานร่วมกับอุปกรณ์นี้ไม่ได้"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"เลิกเชื่อมต่อแล้ว"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"บันทึกแล้ว"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"แบบจำกัดปริมาณ"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"กลาง"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"เร็ว"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"เร็วมาก"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Wi-Fi จะไม่เชื่อมต่ออัตโนมัติในตอนนี้"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-tl/strings.xml b/libs/WifiTrackerLib/res/values-tl/strings.xml
index a296cbf78..8d21cc663 100644
--- a/libs/WifiTrackerLib/res/values-tl/strings.xml
+++ b/libs/WifiTrackerLib/res/values-tl/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Mahinang signal. Subukang mas lumapit sa router."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Lampas na sa kapasidad ang network. Subukan ulit sa ibang pagkakataon."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Hindi makakonekta. Subukan ulit sa ibang pagkakataon."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Hindi makakonekta. Subukan ulit sa ibang pagkakataon."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Hindi compatible ang network sa device na ito"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Nadiskonekta"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Naka-save"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Nakametro"</string>
diff --git a/libs/WifiTrackerLib/res/values-tr/strings.xml b/libs/WifiTrackerLib/res/values-tr/strings.xml
index d28646b5c..fa99bd560 100644
--- a/libs/WifiTrackerLib/res/values-tr/strings.xml
+++ b/libs/WifiTrackerLib/res/values-tr/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Sinyal gücü zayıf. Yönlendiriciye yaklaşmayı deneyin."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Ağ kapasitesi aşıldı. Daha sonra tekrar deneyin."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Bağlanılamıyor. Daha sonra tekrar deneyin."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Bağlanılamıyor. Daha sonra tekrar deneyin."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Ağ bu cihazla uyumlu değil"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Bağlı değil"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Kayıtlı"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Sayaçlı"</string>
@@ -59,5 +59,5 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Orta"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Hızlı"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Çok Hızlı"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Şu anda kablosuz ağa otomatik olarak bağlanılamıyor"</string>
+    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Kablosuz ağa şu anda otomatik olarak bağlanılamıyor"</string>
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-uk/strings.xml b/libs/WifiTrackerLib/res/values-uk/strings.xml
index f95b7283a..6b3a5b0e7 100644
--- a/libs/WifiTrackerLib/res/values-uk/strings.xml
+++ b/libs/WifiTrackerLib/res/values-uk/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Слабкий сигнал. Підійдіть ближче до маршрутизатора."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Мережа перенавантажена. Повторіть спробу пізніше."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Не вдалося підключитися. Повторіть спробу пізніше."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Не вдалося підключитися. Повторіть спробу пізніше."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Мережа несумісна з цим пристроєм"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Відключено"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Збережено"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"З тарифікацією трафіку"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Середня"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Швидка"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Дуже швидка"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Пристрій не підключатиметься до Wi-Fi автоматично"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-ur/strings.xml b/libs/WifiTrackerLib/res/values-ur/strings.xml
index 5d6d7e4d1..f0dc04455 100644
--- a/libs/WifiTrackerLib/res/values-ur/strings.xml
+++ b/libs/WifiTrackerLib/res/values-ur/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"کمزور سگنل۔ روٹر کے قریب منتقل کرنے کی کوشش کریں۔"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"نیٹ ورک کی گنجائش حد سے زیادہ ہے۔ بعد میں دوبارہ کوشش کریں۔"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"منسلک نہیں ہو سکا۔ بعد میں دوبارہ کوشش کریں۔"</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"منسلک نہیں ہو سکا۔ بعد میں دوبارہ کوشش کریں۔"</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"نیٹ ورک اس آلے کے ساتھ موافقت نہیں رکھتا ہے"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"غیر منسلک"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"محفوظ کردہ"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"میٹرڈ"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"متوسط"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"تیز"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"بہت تیز"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"‏ابھی Wi-Fi خود کار طور پر منسلک نہیں ہوگا"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-uz/strings.xml b/libs/WifiTrackerLib/res/values-uz/strings.xml
index 41ea13aac..e421c7764 100644
--- a/libs/WifiTrackerLib/res/values-uz/strings.xml
+++ b/libs/WifiTrackerLib/res/values-uz/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="wifitrackerlib_summary_separator" msgid="6613897475167609815">" / "</string>
-    <string name="wifitrackerlib_auto_connect_disable" msgid="4714835547164460651">"Avtomatik ulanish yoqilmagan"</string>
+    <string name="wifitrackerlib_auto_connect_disable" msgid="4714835547164460651">"Avtomatik ulash yoqilmagan"</string>
     <string name="wifitrackerlib_saved_network" msgid="5353460010746484376">"Saqlangan: <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifitrackerlib_wifi_no_internet_no_reconnect" msgid="6618216332537706908">"Avtomatik ravishda ulanilmaydi"</string>
     <string name="wifitrackerlib_wifi_no_internet" msgid="4998563744669636949">"Internetga ulanmagan"</string>
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Signal kuchsiz. Routerga yaqinlashtiring."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Tarmoqda joy qolmadi. Keyinroq urining."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Ulanish imkonsiz. Keyinroq urining."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Ulanish imkonsiz. Keyinroq urining."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Tarmoq bu qurilma bilan mos emas."</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Uzildi"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Saqlangan"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Trafik hisoblanadi"</string>
diff --git a/libs/WifiTrackerLib/res/values-vi/strings.xml b/libs/WifiTrackerLib/res/values-vi/strings.xml
index efc1131a9..ea69e9bb7 100644
--- a/libs/WifiTrackerLib/res/values-vi/strings.xml
+++ b/libs/WifiTrackerLib/res/values-vi/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Tín hiệu yếu. Hãy thử di chuyển đến gần bộ định tuyến hơn."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Mạng bị quá tải. Hãy thử lại sau."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Không thể kết nối. Hãy thử lại sau."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Không thể kết nối. Hãy thử lại sau."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Mạng không tương thích với thiết bị này"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Đã ngắt kết nối"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Đã lưu"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Đo lượng dữ liệu"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"Trung bình"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"Nhanh"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"Rất nhanh"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"Tạm thời, Wi-Fi sẽ không tự động kết nối"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-zh-rCN/strings.xml b/libs/WifiTrackerLib/res/values-zh-rCN/strings.xml
index 8a1b5a395..1ca747208 100644
--- a/libs/WifiTrackerLib/res/values-zh-rCN/strings.xml
+++ b/libs/WifiTrackerLib/res/values-zh-rCN/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"信号微弱。请尝试移到离路由器更近的地方。"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"网络已过载。请稍后重试。"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"无法连接。请稍后重试。"</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"无法连接，请稍后重试。"</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"网络与此设备不兼容"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"已断开连接"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"已保存"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"按流量计费"</string>
@@ -59,5 +59,6 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"中"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"快"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"很快"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"WLAN 暂时无法自动连接"</string>
+    <!-- no translation found for wifitrackerlib_wifi_wont_autoconnect_for_now (4923161724964349851) -->
+    <skip />
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-zh-rHK/strings.xml b/libs/WifiTrackerLib/res/values-zh-rHK/strings.xml
index 5da6428b5..85d1c568f 100644
--- a/libs/WifiTrackerLib/res/values-zh-rHK/strings.xml
+++ b/libs/WifiTrackerLib/res/values-zh-rHK/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"訊號偏弱，請嘗試移近路由器。"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"網絡流量超出上限，請稍後再試。"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"無法連線，請稍後再試。"</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"無法連線，請稍後再試。"</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"網絡與此裝置不兼容"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"已中斷連線"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"已儲存"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"按用量收費"</string>
@@ -59,5 +59,5 @@
     <string name="wifitrackerlib_speed_label_medium" msgid="2249280306855290094">"中"</string>
     <string name="wifitrackerlib_speed_label_fast" msgid="2593921008376044650">"快"</string>
     <string name="wifitrackerlib_speed_label_very_fast" msgid="4162759416291355173">"非常快"</string>
-    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"目前系統不會自動連線至 Wi-Fi"</string>
+    <string name="wifitrackerlib_wifi_wont_autoconnect_for_now" msgid="4923161724964349851">"目前不會自動連上 Wi-Fi"</string>
 </resources>
diff --git a/libs/WifiTrackerLib/res/values-zh-rTW/strings.xml b/libs/WifiTrackerLib/res/values-zh-rTW/strings.xml
index 62e4da130..d6636d513 100644
--- a/libs/WifiTrackerLib/res/values-zh-rTW/strings.xml
+++ b/libs/WifiTrackerLib/res/values-zh-rTW/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"網路訊號微弱，建議你移動到比較靠近路由器的位置。"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"網路流量超載，請稍後再試。"</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"無法連線，請稍後再試。"</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"無法連線，請稍後再試。"</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"找不到與這部裝置相容的網路"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"已中斷連線"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"已儲存"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"計量付費"</string>
diff --git a/libs/WifiTrackerLib/res/values-zu/strings.xml b/libs/WifiTrackerLib/res/values-zu/strings.xml
index 41b1e1ac8..77eb70690 100644
--- a/libs/WifiTrackerLib/res/values-zu/strings.xml
+++ b/libs/WifiTrackerLib/res/values-zu/strings.xml
@@ -30,7 +30,7 @@
     <string name="wifitrackerlib_wifi_mbo_oce_assoc_disallowed_insufficient_rssi" msgid="5078611817423181773">"Isignali ebuthakathaka. Zama ukusondela eduze nomzila."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_max_num_sta_associated" msgid="4418848919914618807">"Inethiwekhi ingaphezu komthamo. Zama futhi emuva kwesikhathi."</string>
     <string name="wifitrackerlib_wifi_mbo_assoc_disallowed_cannot_connect" msgid="2692286425448897083">"Ayikwazi ukuxhuma. Zama futhi emuva kwesikhathi."</string>
-    <string name="wifitrackerlib_wifi_network_not_found" msgid="1308764769892463388">"Ayikwazi ukuxhuma. Zama futhi emuva kwesikhathi."</string>
+    <string name="wifitrackerlib_wifi_network_not_found" msgid="2208793323700267293">"Inethiwekhi ayihambisani nale divayisi"</string>
     <string name="wifitrackerlib_wifi_disconnected" msgid="3320414360982942679">"Inqamukile"</string>
     <string name="wifitrackerlib_wifi_remembered" msgid="2406091442008343041">"Kulondoloziwe"</string>
     <string name="wifitrackerlib_wifi_metered_label" msgid="8818508951778620385">"Kulinganisiwe"</string>
diff --git a/libs/WifiTrackerLib/res/values/strings.xml b/libs/WifiTrackerLib/res/values/strings.xml
index 4b4741a6c..3a91ae411 100644
--- a/libs/WifiTrackerLib/res/values/strings.xml
+++ b/libs/WifiTrackerLib/res/values/strings.xml
@@ -222,4 +222,7 @@
 
     <!-- Toast message for when the user selects cellular as the internet provider and Wi-Fi auto-connect is temporarily disabled -->
     <string name="wifitrackerlib_wifi_wont_autoconnect_for_now">Wi-Fi won\u2019t auto-connect for now</string>
+
+    <!-- [DO NOT TRANSLATE] Comma-separated list of packages whose saved networks should show no attribution annotation. -->
+    <string name="wifitrackerlib_no_attribution_annotation_packages">com.google.android.setupwizard,com.google.android.gms</string>
 </resources>
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/BaseWifiTracker.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/BaseWifiTracker.java
index 2b9bc78f7..895687eae 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/BaseWifiTracker.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/BaseWifiTracker.java
@@ -140,6 +140,7 @@ public class BaseWifiTracker implements LifecycleObserver {
     private final BaseWifiTracker.Scanner mScanner;
     private final BaseWifiTrackerCallback mListener;
 
+    protected final WifiTrackerInjector mInjector;
     protected final Context mContext;
     protected final WifiManager mWifiManager;
     protected final ConnectivityManager mConnectivityManager;
@@ -275,6 +276,7 @@ public class BaseWifiTracker implements LifecycleObserver {
     /**
      * Constructor for BaseWifiTracker.
      *
+     * @param wifiTrackerInjector injector for commonly referenced objects.
      * @param lifecycle Lifecycle this is tied to for lifecycle callbacks.
      * @param context Context for registering broadcast receiver and for resource strings.
      * @param wifiManager Provides all Wi-Fi info.
@@ -286,7 +288,9 @@ public class BaseWifiTracker implements LifecycleObserver {
      * @param maxScanAgeMillis Max age for tracked WifiEntries.
      * @param scanIntervalMillis Interval between initiating scans.
      */
-    BaseWifiTracker(@NonNull Lifecycle lifecycle, @NonNull Context context,
+    BaseWifiTracker(
+            @NonNull WifiTrackerInjector injector,
+            @NonNull Lifecycle lifecycle, @NonNull Context context,
             @NonNull WifiManager wifiManager,
             @NonNull ConnectivityManager connectivityManager,
             @NonNull NetworkScoreManager networkScoreManager,
@@ -297,6 +301,7 @@ public class BaseWifiTracker implements LifecycleObserver {
             long scanIntervalMillis,
             BaseWifiTrackerCallback listener,
             String tag) {
+        mInjector = injector;
         lifecycle.addObserver(this);
         mContext = context;
         mWifiManager = wifiManager;
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/NetworkDetailsTracker.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/NetworkDetailsTracker.java
index dd3819dee..5ef624acc 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/NetworkDetailsTracker.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/NetworkDetailsTracker.java
@@ -33,6 +33,7 @@ import android.os.Handler;
 import androidx.annotation.AnyThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import androidx.annotation.WorkerThread;
 import androidx.lifecycle.Lifecycle;
 
@@ -71,12 +72,41 @@ public abstract class NetworkDetailsTracker extends BaseWifiTracker {
             long maxScanAgeMillis,
             long scanIntervalMillis,
             String key) {
+        return createNetworkDetailsTracker(
+                new WifiTrackerInjector(context),
+                lifecycle,
+                context,
+                wifiManager,
+                connectivityManager,
+                networkScoreManager,
+                mainHandler,
+                workerHandler,
+                clock,
+                maxScanAgeMillis,
+                scanIntervalMillis,
+                key);
+    }
+
+    @VisibleForTesting
+    static NetworkDetailsTracker createNetworkDetailsTracker(
+            @NonNull WifiTrackerInjector injector,
+            @NonNull Lifecycle lifecycle,
+            @NonNull Context context,
+            @NonNull WifiManager wifiManager,
+            @NonNull ConnectivityManager connectivityManager,
+            @NonNull NetworkScoreManager networkScoreManager,
+            @NonNull Handler mainHandler,
+            @NonNull Handler workerHandler,
+            @NonNull Clock clock,
+            long maxScanAgeMillis,
+            long scanIntervalMillis,
+            String key) {
         if (key.startsWith(StandardWifiEntry.KEY_PREFIX)) {
-            return new StandardNetworkDetailsTracker(lifecycle, context, wifiManager,
+            return new StandardNetworkDetailsTracker(injector, lifecycle, context, wifiManager,
                     connectivityManager, networkScoreManager, mainHandler, workerHandler, clock,
                     maxScanAgeMillis, scanIntervalMillis, key);
         } else if (key.startsWith(PasspointWifiEntry.KEY_PREFIX)) {
-            return new PasspointNetworkDetailsTracker(lifecycle, context, wifiManager,
+            return new PasspointNetworkDetailsTracker(injector, lifecycle, context, wifiManager,
                     connectivityManager, networkScoreManager, mainHandler, workerHandler, clock,
                     maxScanAgeMillis, scanIntervalMillis, key);
         } else {
@@ -91,7 +121,10 @@ public abstract class NetworkDetailsTracker extends BaseWifiTracker {
      * Clients must use {@link NetworkDetailsTracker#createNetworkDetailsTracker} for creating
      * an appropriate concrete instance of this class.
      */
-    NetworkDetailsTracker(@NonNull Lifecycle lifecycle, @NonNull Context context,
+    NetworkDetailsTracker(
+            @NonNull WifiTrackerInjector injector,
+            @NonNull Lifecycle lifecycle,
+            @NonNull Context context,
             @NonNull WifiManager wifiManager,
             @NonNull ConnectivityManager connectivityManager,
             @NonNull NetworkScoreManager networkScoreManager,
@@ -101,7 +134,7 @@ public abstract class NetworkDetailsTracker extends BaseWifiTracker {
             long maxScanAgeMillis,
             long scanIntervalMillis,
             String tag) {
-        super(lifecycle, context, wifiManager, connectivityManager, networkScoreManager,
+        super(injector, lifecycle, context, wifiManager, connectivityManager, networkScoreManager,
                 mainHandler, workerHandler, clock, maxScanAgeMillis, scanIntervalMillis,
                 null /* listener */, tag);
     }
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/NetworkRequestEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/NetworkRequestEntry.java
index 422d34940..fed973941 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/NetworkRequestEntry.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/NetworkRequestEntry.java
@@ -37,11 +37,14 @@ public class NetworkRequestEntry extends StandardWifiEntry {
     //                    Remove once String keys are removed entirely.
     public static final String KEY_PREFIX = "NetworkRequestEntry:";
 
-    NetworkRequestEntry(@NonNull Context context, @NonNull Handler callbackHandler,
+    NetworkRequestEntry(
+            @NonNull WifiTrackerInjector injector,
+            @NonNull Context context, @NonNull Handler callbackHandler,
             @NonNull StandardWifiEntryKey key, @NonNull WifiManager wifiManager,
             @NonNull WifiNetworkScoreCache scoreCache,
             boolean forSavedNetworksPage) throws IllegalArgumentException {
-        super(context, callbackHandler, key, wifiManager, scoreCache, forSavedNetworksPage);
+        super(injector, context, callbackHandler, key, wifiManager, scoreCache,
+                forSavedNetworksPage);
     }
 
     @Override
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointNetworkDetailsTracker.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointNetworkDetailsTracker.java
index 42f816ff6..6bf0a16c8 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointNetworkDetailsTracker.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointNetworkDetailsTracker.java
@@ -39,6 +39,7 @@ import android.util.Pair;
 
 import androidx.annotation.AnyThread;
 import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 import androidx.annotation.WorkerThread;
 import androidx.lifecycle.Lifecycle;
 
@@ -69,7 +70,26 @@ public class PasspointNetworkDetailsTracker extends NetworkDetailsTracker {
             long maxScanAgeMillis,
             long scanIntervalMillis,
             String key) {
-        super(lifecycle, context, wifiManager, connectivityManager, networkScoreManager,
+        this(new WifiTrackerInjector(context), lifecycle, context, wifiManager, connectivityManager,
+                networkScoreManager, mainHandler, workerHandler, clock, maxScanAgeMillis,
+                scanIntervalMillis, key);
+    }
+
+    @VisibleForTesting
+    PasspointNetworkDetailsTracker(
+            @NonNull WifiTrackerInjector injector,
+            @NonNull Lifecycle lifecycle,
+            @NonNull Context context,
+            @NonNull WifiManager wifiManager,
+            @NonNull ConnectivityManager connectivityManager,
+            @NonNull NetworkScoreManager networkScoreManager,
+            @NonNull Handler mainHandler,
+            @NonNull Handler workerHandler,
+            @NonNull Clock clock,
+            long maxScanAgeMillis,
+            long scanIntervalMillis,
+            String key) {
+        super(injector, lifecycle, context, wifiManager, connectivityManager, networkScoreManager,
                 mainHandler, workerHandler, clock, maxScanAgeMillis, scanIntervalMillis, TAG);
 
         Optional<PasspointConfiguration> optionalPasspointConfig =
@@ -79,7 +99,7 @@ public class PasspointNetworkDetailsTracker extends NetworkDetailsTracker {
                                 uniqueIdToPasspointWifiEntryKey(passpointConfig.getUniqueId())))
                         .findAny();
         if (optionalPasspointConfig.isPresent()) {
-            mChosenEntry = new PasspointWifiEntry(mContext, mMainHandler,
+            mChosenEntry = new PasspointWifiEntry(mInjector, mContext, mMainHandler,
                     optionalPasspointConfig.get(), mWifiManager, mWifiNetworkScoreCache,
                     false /* forSavedNetworksPage */);
         } else {
@@ -91,7 +111,7 @@ public class PasspointNetworkDetailsTracker extends NetworkDetailsTracker {
                                             uniqueIdToPasspointWifiEntryKey(wifiConfig.getKey())))
                             .findAny();
             if (optionalWifiConfig.isPresent()) {
-                mChosenEntry = new PasspointWifiEntry(mContext, mMainHandler,
+                mChosenEntry = new PasspointWifiEntry(mInjector, mContext, mMainHandler,
                         optionalWifiConfig.get(), mWifiManager, mWifiNetworkScoreCache,
                         false /* forSavedNetworksPage */);
             } else {
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java
index 59994a9e2..9b776767c 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java
@@ -75,6 +75,7 @@ public class PasspointWifiEntry extends WifiEntry implements WifiEntry.WifiEntry
     @NonNull private final String mKey;
     @NonNull private final String mFqdn;
     @NonNull private final String mFriendlyName;
+    @NonNull private final WifiTrackerInjector mInjector;
     @NonNull private final Context mContext;
     @Nullable
     private PasspointConfiguration mPasspointConfig;
@@ -98,7 +99,9 @@ public class PasspointWifiEntry extends WifiEntry implements WifiEntry.WifiEntry
     /**
      * Create a PasspointWifiEntry with the associated PasspointConfiguration
      */
-    PasspointWifiEntry(@NonNull Context context, @NonNull Handler callbackHandler,
+    PasspointWifiEntry(
+            @NonNull WifiTrackerInjector injector,
+            @NonNull Context context, @NonNull Handler callbackHandler,
             @NonNull PasspointConfiguration passpointConfig,
             @NonNull WifiManager wifiManager,
             @NonNull WifiNetworkScoreCache scoreCache,
@@ -106,7 +109,7 @@ public class PasspointWifiEntry extends WifiEntry implements WifiEntry.WifiEntry
         super(callbackHandler, wifiManager, scoreCache, forSavedNetworksPage);
 
         checkNotNull(passpointConfig, "Cannot construct with null PasspointConfiguration!");
-
+        mInjector = injector;
         mContext = context;
         mPasspointConfig = passpointConfig;
         mKey = uniqueIdToPasspointWifiEntryKey(passpointConfig.getUniqueId());
@@ -123,7 +126,9 @@ public class PasspointWifiEntry extends WifiEntry implements WifiEntry.WifiEntry
      * suggestions, since WifiManager#getAllMatchingWifiConfigs() does not provide a corresponding
      * PasspointConfiguration.
      */
-    PasspointWifiEntry(@NonNull Context context, @NonNull Handler callbackHandler,
+    PasspointWifiEntry(
+            @NonNull WifiTrackerInjector injector,
+            @NonNull Context context, @NonNull Handler callbackHandler,
             @NonNull WifiConfiguration wifiConfig,
             @NonNull WifiManager wifiManager,
             @NonNull WifiNetworkScoreCache scoreCache,
@@ -134,7 +139,7 @@ public class PasspointWifiEntry extends WifiEntry implements WifiEntry.WifiEntry
         if (!wifiConfig.isPasspoint()) {
             throw new IllegalArgumentException("Given WifiConfiguration is not for Passpoint!");
         }
-
+        mInjector = injector;
         mContext = context;
         mWifiConfig = wifiConfig;
         mKey = uniqueIdToPasspointWifiEntryKey(wifiConfig.getKey());
@@ -181,7 +186,7 @@ public class PasspointWifiEntry extends WifiEntry implements WifiEntry.WifiEntry
             final @ConnectedState int connectedState = getConnectedState();
             switch (connectedState) {
                 case CONNECTED_STATE_DISCONNECTED:
-                    connectedStateDescription = getDisconnectedDescription(mContext,
+                    connectedStateDescription = getDisconnectedDescription(mInjector, mContext,
                             mWifiConfig,
                             mForSavedNetworksPage,
                             concise);
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/SavedNetworkTracker.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/SavedNetworkTracker.java
index 8933ce739..f7d1ad591 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/SavedNetworkTracker.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/SavedNetworkTracker.java
@@ -41,6 +41,7 @@ import androidx.annotation.GuardedBy;
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import androidx.annotation.WorkerThread;
 import androidx.lifecycle.Lifecycle;
 
@@ -89,8 +90,27 @@ public class SavedNetworkTracker extends BaseWifiTracker {
             @NonNull Clock clock,
             long maxScanAgeMillis,
             long scanIntervalMillis,
-            @Nullable SavedNetworkTracker.SavedNetworkTrackerCallback listener) {
-        super(lifecycle, context, wifiManager, connectivityManager, networkScoreManager,
+            @Nullable SavedNetworkTrackerCallback listener) {
+        this(new WifiTrackerInjector(context), lifecycle, context, wifiManager, connectivityManager,
+                networkScoreManager, mainHandler, workerHandler, clock, maxScanAgeMillis,
+                scanIntervalMillis, listener);
+    }
+
+    @VisibleForTesting
+    SavedNetworkTracker(
+            @NonNull WifiTrackerInjector injector,
+            @NonNull Lifecycle lifecycle,
+            @NonNull Context context,
+            @NonNull WifiManager wifiManager,
+            @NonNull ConnectivityManager connectivityManager,
+            @NonNull NetworkScoreManager networkScoreManager,
+            @NonNull Handler mainHandler,
+            @NonNull Handler workerHandler,
+            @NonNull Clock clock,
+            long maxScanAgeMillis,
+            long scanIntervalMillis,
+            @Nullable SavedNetworkTrackerCallback listener) {
+        super(injector, lifecycle, context, wifiManager, connectivityManager, networkScoreManager,
                 mainHandler, workerHandler, clock, maxScanAgeMillis, scanIntervalMillis, listener,
                 TAG);
         mListener = listener;
@@ -285,8 +305,8 @@ public class SavedNetworkTracker extends BaseWifiTracker {
 
         // Create new entry for each unmatched config
         for (StandardWifiEntryKey key : wifiConfigsByKey.keySet()) {
-            mStandardWifiEntryCache.add(new StandardWifiEntry(mContext, mMainHandler, key,
-                    wifiConfigsByKey.get(key), null, mWifiManager, mWifiNetworkScoreCache,
+            mStandardWifiEntryCache.add(new StandardWifiEntry(mInjector, mContext, mMainHandler,
+                    key, wifiConfigsByKey.get(key), null, mWifiManager, mWifiNetworkScoreCache,
                     true /* forSavedNetworksPage */));
         }
     }
@@ -317,8 +337,9 @@ public class SavedNetworkTracker extends BaseWifiTracker {
         // Create new entry for each unmatched config
         for (String key : passpointConfigsByKey.keySet()) {
             mPasspointWifiEntryCache.put(key,
-                    new PasspointWifiEntry(mContext, mMainHandler, passpointConfigsByKey.get(key),
-                            mWifiManager, mWifiNetworkScoreCache, true /* forSavedNetworksPage */));
+                    new PasspointWifiEntry(mInjector, mContext, mMainHandler,
+                            passpointConfigsByKey.get(key), mWifiManager, mWifiNetworkScoreCache,
+                            true /* forSavedNetworksPage */));
         }
     }
 
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardNetworkDetailsTracker.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardNetworkDetailsTracker.java
index 39470c65b..e8010fc72 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardNetworkDetailsTracker.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardNetworkDetailsTracker.java
@@ -36,6 +36,7 @@ import android.os.Handler;
 
 import androidx.annotation.AnyThread;
 import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 import androidx.annotation.WorkerThread;
 import androidx.lifecycle.Lifecycle;
 
@@ -64,17 +65,36 @@ public class StandardNetworkDetailsTracker extends NetworkDetailsTracker {
             long maxScanAgeMillis,
             long scanIntervalMillis,
             String key) {
-        super(lifecycle, context, wifiManager, connectivityManager, networkScoreManager,
+        this(new WifiTrackerInjector(context), lifecycle, context, wifiManager, connectivityManager,
+                networkScoreManager, mainHandler, workerHandler, clock, maxScanAgeMillis,
+                scanIntervalMillis, key);
+    }
+
+    @VisibleForTesting
+    StandardNetworkDetailsTracker(
+            @NonNull WifiTrackerInjector injector,
+            @NonNull Lifecycle lifecycle,
+            @NonNull Context context,
+            @NonNull WifiManager wifiManager,
+            @NonNull ConnectivityManager connectivityManager,
+            @NonNull NetworkScoreManager networkScoreManager,      
+            @NonNull Handler mainHandler,
+            @NonNull Handler workerHandler,
+            @NonNull Clock clock,
+            long maxScanAgeMillis,
+            long scanIntervalMillis,
+            String key) {
+        super(injector, lifecycle, context, wifiManager, connectivityManager, networkScoreManager,
                 mainHandler, workerHandler, clock, maxScanAgeMillis, scanIntervalMillis, TAG);
         mKey = new StandardWifiEntryKey(key);
         if (mKey.isNetworkRequest()) {
             mIsNetworkRequest = true;
-            mChosenEntry = new NetworkRequestEntry(mContext, mMainHandler, mKey, mWifiManager,
-                    mWifiNetworkScoreCache, false /* forSavedNetworksPage */);
+            mChosenEntry = new NetworkRequestEntry(mInjector, mContext, mMainHandler, mKey,
+                    mWifiManager, mWifiNetworkScoreCache, false /* forSavedNetworksPage */);
         } else {
             mIsNetworkRequest = false;
-            mChosenEntry = new StandardWifiEntry(mContext, mMainHandler, mKey, mWifiManager,
-                    mWifiNetworkScoreCache, false /* forSavedNetworksPage */);
+            mChosenEntry = new StandardWifiEntry(mInjector, mContext, mMainHandler, mKey,
+                    mWifiManager, mWifiNetworkScoreCache, false /* forSavedNetworksPage */);
         }
         // It is safe to call updateStartInfo() in the main thread here since onStart() won't have
         // a chance to post handleOnStart() on the worker thread until the main thread finishes
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
index 994331a69..4f63ced83 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/StandardWifiEntry.java
@@ -101,6 +101,7 @@ public class StandardWifiEntry extends WifiEntry {
 
     @NonNull private final StandardWifiEntryKey mKey;
 
+    @NonNull private final WifiTrackerInjector mInjector;
     @NonNull private final Context mContext;
 
     // Map of security type to matching scan results
@@ -127,11 +128,14 @@ public class StandardWifiEntry extends WifiEntry {
     private final boolean mIsWpa3SuiteBSupported;
     private final boolean mIsEnhancedOpenSupported;
 
-    StandardWifiEntry(@NonNull Context context, @NonNull Handler callbackHandler,
+    StandardWifiEntry(
+            @NonNull WifiTrackerInjector injector,
+            @NonNull Context context, @NonNull Handler callbackHandler,
             @NonNull StandardWifiEntryKey key, @NonNull WifiManager wifiManager,
             @NonNull WifiNetworkScoreCache scoreCache,
             boolean forSavedNetworksPage) {
         super(callbackHandler, wifiManager, scoreCache, forSavedNetworksPage);
+        mInjector = injector;
         mContext = context;
         mKey = key;
         mIsWpa3SaeSupported = wifiManager.isWpa3SaeSupported();
@@ -140,14 +144,16 @@ public class StandardWifiEntry extends WifiEntry {
         updateRecommendationServiceLabel();
     }
 
-    StandardWifiEntry(@NonNull Context context, @NonNull Handler callbackHandler,
+    StandardWifiEntry(
+            @NonNull WifiTrackerInjector injector,
+            @NonNull Context context, @NonNull Handler callbackHandler,
             @NonNull StandardWifiEntryKey key,
             @Nullable List<WifiConfiguration> configs,
             @Nullable List<ScanResult> scanResults,
             @NonNull WifiManager wifiManager,
             @NonNull WifiNetworkScoreCache scoreCache,
             boolean forSavedNetworksPage) throws IllegalArgumentException {
-        this(context, callbackHandler, key, wifiManager, scoreCache,
+        this(injector, context, callbackHandler, key, wifiManager, scoreCache,
                 forSavedNetworksPage);
         if (configs != null && !configs.isEmpty()) {
             updateConfig(configs);
@@ -180,7 +186,7 @@ public class StandardWifiEntry extends WifiEntry {
         final @ConnectedState int connectedState = getConnectedState();
         switch (connectedState) {
             case CONNECTED_STATE_DISCONNECTED:
-                connectedStateDescription = getDisconnectedDescription(mContext,
+                connectedStateDescription = getDisconnectedDescription(mInjector, mContext,
                         mTargetWifiConfig,
                         mForSavedNetworksPage,
                         concise);
@@ -429,6 +435,10 @@ public class StandardWifiEntry extends WifiEntry {
      */
     @Override
     public synchronized boolean canShare() {
+        if (mInjector.isDemoMode()) {
+            return false;
+        }
+
         if (getWifiConfiguration() == null) {
             return false;
         }
@@ -452,6 +462,10 @@ public class StandardWifiEntry extends WifiEntry {
      */
     @Override
     public synchronized boolean canEasyConnect() {
+        if (mInjector.isDemoMode()) {
+            return false;
+        }
+
         if (getWifiConfiguration() == null) {
             return false;
         }
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/Utils.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/Utils.java
index 9c4f376ac..e4341ece7 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/Utils.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/Utils.java
@@ -35,7 +35,6 @@ import android.net.NetworkCapabilities;
 import android.net.NetworkInfo;
 import android.net.NetworkInfo.DetailedState;
 import android.net.NetworkKey;
-import android.net.NetworkScoreManager;
 import android.net.ScoredNetwork;
 import android.net.WifiKey;
 import android.net.wifi.ScanResult;
@@ -44,7 +43,6 @@ import android.net.wifi.WifiConfiguration.NetworkSelectionStatus;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiNetworkScoreCache;
 import android.os.PersistableBundle;
-import android.provider.Settings;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
@@ -55,13 +53,11 @@ import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.text.style.ClickableSpan;
-import android.util.FeatureFlagUtils;
 import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.settingslib.HelpUtils;
 
 import java.util.ArrayList;
@@ -74,27 +70,6 @@ import java.util.StringJoiner;
  * Utility methods for WifiTrackerLib.
  */
 public class Utils {
-    /** Copy of the @hide Settings.Global.USE_OPEN_WIFI_PACKAGE constant. */
-    static final String SETTINGS_GLOBAL_USE_OPEN_WIFI_PACKAGE = "use_open_wifi_package";
-
-    @VisibleForTesting
-    static FeatureFlagUtilsWrapper sFeatureFlagUtilsWrapper = new FeatureFlagUtilsWrapper();
-
-    static class FeatureFlagUtilsWrapper {
-        boolean isProviderModelEnabled(Context context) {
-            return FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL);
-        }
-    }
-
-    private static NetworkScoreManager sNetworkScoreManager;
-
-    private static String getActiveScorerPackage(@NonNull Context context) {
-        if (sNetworkScoreManager == null) {
-            sNetworkScoreManager = context.getSystemService(NetworkScoreManager.class);
-        }
-        return sNetworkScoreManager.getActiveScorerPackage();
-    }
-
     // Returns the ScanResult with the best RSSI from a list of ScanResults.
     @Nullable
     public static ScanResult getBestScanResultByLevel(@NonNull List<ScanResult> scanResults) {
@@ -297,13 +272,6 @@ public class Utils {
      */
     static String getAppLabel(Context context, String packageName) {
         try {
-            String openWifiPackageName = Settings.Global.getString(context.getContentResolver(),
-                    SETTINGS_GLOBAL_USE_OPEN_WIFI_PACKAGE);
-            if (!TextUtils.isEmpty(openWifiPackageName) && TextUtils.equals(packageName,
-                    getActiveScorerPackage(context))) {
-                packageName = openWifiPackageName;
-            }
-
             ApplicationInfo appInfo = context.getPackageManager().getApplicationInfo(
                     packageName,
                     0 /* flags */);
@@ -321,8 +289,6 @@ public class Utils {
             boolean isLowQuality) {
         final StringJoiner sj = new StringJoiner(context.getString(
                 R.string.wifitrackerlib_summary_separator));
-        final boolean hideConnected =
-                !isDefaultNetwork && sFeatureFlagUtilsWrapper.isProviderModelEnabled(context);
 
         if (wifiConfiguration != null) {
             if (wifiConfiguration.fromWifiNetworkSuggestion
@@ -331,7 +297,7 @@ public class Utils {
                 final String suggestionOrSpecifierLabel =
                         getSuggestionOrSpecifierLabel(context, wifiConfiguration);
                 if (!TextUtils.isEmpty(suggestionOrSpecifierLabel)) {
-                    if (hideConnected) {
+                    if (!isDefaultNetwork) {
                         sj.add(context.getString(R.string.wifitrackerlib_available_via_app,
                                 suggestionOrSpecifierLabel));
                     } else {
@@ -339,7 +305,7 @@ public class Utils {
                                 suggestionOrSpecifierLabel));
                     }
                 }
-            } else if (wifiConfiguration.isEphemeral() && !hideConnected) {
+            } else if (wifiConfiguration.isEphemeral() && isDefaultNetwork) {
                 // For ephemeral networks to show "Automatically connected via ..."
                 if (!TextUtils.isEmpty(recommendationServiceLabel)) {
                     sj.add(String.format(context.getString(
@@ -364,7 +330,7 @@ public class Utils {
         }
 
         // Default to "Connected" if nothing else to display
-        if (sj.length() == 0 && !hideConnected) {
+        if (sj.length() == 0 && isDefaultNetwork) {
             return context.getResources().getStringArray(R.array.wifitrackerlib_wifi_status)
                     [DetailedState.CONNECTED.ordinal()];
         }
@@ -388,11 +354,13 @@ public class Utils {
     }
 
 
-    static String getDisconnectedDescription(Context context,
+    static String getDisconnectedDescription(
+            @NonNull WifiTrackerInjector injector,
+            Context context,
             WifiConfiguration wifiConfiguration,
             boolean forSavedNetworksPage,
             boolean concise) {
-        if (context == null) {
+        if (context == null || wifiConfiguration == null) {
             return "";
         }
         final StringJoiner sj = new StringJoiner(context.getString(
@@ -401,24 +369,26 @@ public class Utils {
         // For "Saved", "Saved by ...", and "Available via..."
         if (concise) {
             sj.add(context.getString(R.string.wifitrackerlib_wifi_disconnected));
-        } else if (wifiConfiguration != null) {
-            if (forSavedNetworksPage && !wifiConfiguration.isPasspoint()) {
-                final CharSequence appLabel = getAppLabel(context, wifiConfiguration.creatorName);
+        } else if (forSavedNetworksPage && !wifiConfiguration.isPasspoint()) {
+            if (!injector.getNoAttributionAnnotationPackages().contains(
+                    wifiConfiguration.creatorName)) {
+                final CharSequence appLabel = getAppLabel(context,
+                        wifiConfiguration.creatorName);
                 if (!TextUtils.isEmpty(appLabel)) {
                     sj.add(context.getString(R.string.wifitrackerlib_saved_network, appLabel));
                 }
-            } else {
-                if (wifiConfiguration.fromWifiNetworkSuggestion) {
-                    final String suggestionOrSpecifierLabel =
-                            getSuggestionOrSpecifierLabel(context, wifiConfiguration);
-                    if (!TextUtils.isEmpty(suggestionOrSpecifierLabel)) {
-                        sj.add(context.getString(
-                                R.string.wifitrackerlib_available_via_app,
-                                suggestionOrSpecifierLabel));
-                    }
-                } else {
-                    sj.add(context.getString(R.string.wifitrackerlib_wifi_remembered));
+            }
+        } else {
+            if (wifiConfiguration.fromWifiNetworkSuggestion) {
+                final String suggestionOrSpecifierLabel =
+                        getSuggestionOrSpecifierLabel(context, wifiConfiguration);
+                if (!TextUtils.isEmpty(suggestionOrSpecifierLabel)) {
+                    sj.add(context.getString(
+                            R.string.wifitrackerlib_available_via_app,
+                            suggestionOrSpecifierLabel));
                 }
+            } else {
+                sj.add(context.getString(R.string.wifitrackerlib_wifi_remembered));
             }
         }
 
@@ -676,7 +646,9 @@ public class Utils {
     }
 
     /**
-     * Check if the SIM is present for target carrier Id.
+     * Check if the SIM is present for target carrier Id. If the carrierId is
+     * {@link TelephonyManager#UNKNOWN_CARRIER_ID}, then this returns true if there is any SIM
+     * present.
      */
     static boolean isSimPresent(@NonNull Context context, int carrierId) {
         SubscriptionManager subscriptionManager =
@@ -687,6 +659,11 @@ public class Utils {
         if (subInfoList == null || subInfoList.isEmpty()) {
             return false;
         }
+        if (carrierId == TelephonyManager.UNKNOWN_CARRIER_ID) {
+            // Return true if any SIM is present for UNKNOWN_CARRIER_ID since the framework will
+            // match this to the default data SIM.
+            return true;
+        }
         return subInfoList.stream()
                 .anyMatch(info -> info.getCarrierId() == carrierId);
     }
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java
index e97aa28b6..f238c7992 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java
@@ -58,6 +58,7 @@ import androidx.annotation.GuardedBy;
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import androidx.annotation.WorkerThread;
 import androidx.lifecycle.Lifecycle;
 
@@ -149,7 +150,26 @@ public class WifiPickerTracker extends BaseWifiTracker {
             long maxScanAgeMillis,
             long scanIntervalMillis,
             @Nullable WifiPickerTrackerCallback listener) {
-        super(lifecycle, context, wifiManager, connectivityManager, networkScoreManager,
+        this(new WifiTrackerInjector(context), lifecycle, context, wifiManager, connectivityManager,
+                networkScoreManager, mainHandler, workerHandler, clock, maxScanAgeMillis,
+                scanIntervalMillis, listener);
+    }
+
+    @VisibleForTesting
+    WifiPickerTracker(
+            @NonNull WifiTrackerInjector injector,
+            @NonNull Lifecycle lifecycle,
+            @NonNull Context context,
+            @NonNull WifiManager wifiManager,
+            @NonNull ConnectivityManager connectivityManager,
+            @NonNull NetworkScoreManager networkScoreManager,
+            @NonNull Handler mainHandler,
+            @NonNull Handler workerHandler,
+            @NonNull Clock clock,
+            long maxScanAgeMillis,
+            long scanIntervalMillis,
+            @Nullable WifiPickerTrackerCallback listener) {
+        super(injector, lifecycle, context, wifiManager, connectivityManager, networkScoreManager,
                 mainHandler, workerHandler, clock, maxScanAgeMillis, scanIntervalMillis, listener,
                 TAG);
         mListener = listener;
@@ -375,6 +395,9 @@ public class WifiPickerTracker extends BaseWifiTracker {
                     && mNetworkRequestEntry.getConnectedState() != CONNECTED_STATE_DISCONNECTED) {
                 mConnectedWifiEntry = mNetworkRequestEntry;
             }
+            if (mConnectedWifiEntry != null) {
+                mConnectedWifiEntry.setIsDefaultNetwork(mIsWifiDefaultRoute);
+            }
             mWifiEntries.clear();
             final Set<ScanResultKey> scanResultKeysWithVisibleSuggestions =
                     mSuggestedWifiEntryCache.stream()
@@ -476,8 +499,8 @@ public class WifiPickerTracker extends BaseWifiTracker {
         for (ScanResultKey scanKey: newScanKeys) {
             final StandardWifiEntryKey entryKey =
                     new StandardWifiEntryKey(scanKey, true /* isTargetingNewNetworks */);
-            final StandardWifiEntry newEntry = new StandardWifiEntry(mContext, mMainHandler,
-                    entryKey, mStandardWifiConfigCache.get(entryKey),
+            final StandardWifiEntry newEntry = new StandardWifiEntry(mInjector, mContext,
+                    mMainHandler, entryKey, mStandardWifiConfigCache.get(entryKey),
                     scanResultsByKey.get(scanKey), mWifiManager, mWifiNetworkScoreCache,
                     false /* forSavedNetworksPage */);
             mStandardWifiEntryCache.add(newEntry);
@@ -528,8 +551,8 @@ public class WifiPickerTracker extends BaseWifiTracker {
                     || !scanResultsByKey.containsKey(scanKey)) {
                 continue;
             }
-            final StandardWifiEntry newEntry = new StandardWifiEntry(mContext, mMainHandler,
-                    entryKey, mSuggestedConfigCache.get(entryKey),
+            final StandardWifiEntry newEntry = new StandardWifiEntry(mInjector, mContext,
+                    mMainHandler, entryKey, mSuggestedConfigCache.get(entryKey),
                     scanResultsByKey.get(scanKey), mWifiManager, mWifiNetworkScoreCache,
                     false /* forSavedNetworksPage */);
             newEntry.setUserShareable(userSharedEntryKeys.contains(entryKey));
@@ -561,11 +584,11 @@ public class WifiPickerTracker extends BaseWifiTracker {
             // Create PasspointWifiEntry if one doesn't exist for the seen key yet.
             if (!mPasspointWifiEntryCache.containsKey(key)) {
                 if (wifiConfig.fromWifiNetworkSuggestion) {
-                    mPasspointWifiEntryCache.put(key, new PasspointWifiEntry(mContext,
+                    mPasspointWifiEntryCache.put(key, new PasspointWifiEntry(mInjector, mContext,
                             mMainHandler, wifiConfig, mWifiManager,
                             mWifiNetworkScoreCache, false /* forSavedNetworksPage */));
                 } else if (mPasspointConfigCache.containsKey(key)) {
-                    mPasspointWifiEntryCache.put(key, new PasspointWifiEntry(mContext,
+                    mPasspointWifiEntryCache.put(key, new PasspointWifiEntry(mInjector, mContext,
                             mMainHandler, mPasspointConfigCache.get(key), mWifiManager,
                             mWifiNetworkScoreCache, false /* forSavedNetworksPage */));
                 } else {
@@ -821,8 +844,9 @@ public class WifiPickerTracker extends BaseWifiTracker {
         final StandardWifiEntryKey entryKey = new StandardWifiEntryKey(matchingConfigs.get(0));
         if (mNetworkRequestEntry == null
                 || !mNetworkRequestEntry.getStandardWifiEntryKey().equals(entryKey)) {
-            mNetworkRequestEntry = new NetworkRequestEntry(mContext, mMainHandler, entryKey,
-                    mWifiManager, mWifiNetworkScoreCache, false /* forSavedNetworksPage */);
+            mNetworkRequestEntry = new NetworkRequestEntry(mInjector, mContext, mMainHandler,
+                    entryKey, mWifiManager, mWifiNetworkScoreCache,
+                    false /* forSavedNetworksPage */);
             mNetworkRequestEntry.updateConfig(matchingConfigs);
             updateNetworkRequestEntryScans(mScanResultUpdater.getScanResults());
         }
@@ -859,8 +883,9 @@ public class WifiPickerTracker extends BaseWifiTracker {
                 }
             }
             final StandardWifiEntry connectedEntry =
-                    new StandardWifiEntry(mContext, mMainHandler, entryKey, configs, null,
-                            mWifiManager, mWifiNetworkScoreCache, false /* forSavedNetworksPage */);
+                    new StandardWifiEntry(mInjector, mContext, mMainHandler, entryKey, configs,
+                            null, mWifiManager, mWifiNetworkScoreCache,
+                            false /* forSavedNetworksPage */);
             connectedEntry.updateConnectionInfo(wifiInfo, networkInfo);
             mStandardWifiEntryCache.add(connectedEntry);
             return;
@@ -894,8 +919,9 @@ public class WifiPickerTracker extends BaseWifiTracker {
                 }
             }
             final StandardWifiEntry connectedEntry =
-                    new StandardWifiEntry(mContext, mMainHandler, entryKey, configs, null,
-                            mWifiManager, mWifiNetworkScoreCache, false /* forSavedNetworksPage */);
+                    new StandardWifiEntry(mInjector, mContext, mMainHandler, entryKey, configs,
+                            null, mWifiManager, mWifiNetworkScoreCache,
+                            false /* forSavedNetworksPage */);
             connectedEntry.updateConnectionInfo(wifiInfo, networkInfo);
             mSuggestedWifiEntryCache.add(connectedEntry);
             return;
@@ -929,12 +955,12 @@ public class WifiPickerTracker extends BaseWifiTracker {
                 uniqueIdToPasspointWifiEntryKey(cachedWifiConfig.getKey()));
         PasspointWifiEntry connectedEntry;
         if (passpointConfig != null) {
-            connectedEntry = new PasspointWifiEntry(mContext, mMainHandler,
+            connectedEntry = new PasspointWifiEntry(mInjector, mContext, mMainHandler,
                     passpointConfig, mWifiManager, mWifiNetworkScoreCache,
                     false /* forSavedNetworksPage */);
         } else {
             // Suggested PasspointWifiEntry without a corresponding PasspointConfiguration
-            connectedEntry = new PasspointWifiEntry(mContext, mMainHandler,
+            connectedEntry = new PasspointWifiEntry(mInjector, mContext, mMainHandler,
                     cachedWifiConfig, mWifiManager, mWifiNetworkScoreCache,
                     false /* forSavedNetworksPage */);
         }
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiTrackerInjector.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiTrackerInjector.java
new file mode 100644
index 000000000..44a1959ae
--- /dev/null
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiTrackerInjector.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.wifitrackerlib;
+
+import android.content.Context;
+import android.os.UserManager;
+import android.util.ArraySet;
+
+import androidx.annotation.NonNull;
+
+import java.util.Set;
+
+/**
+ * Wrapper class for commonly referenced objects and static data.
+ */
+public class WifiTrackerInjector {
+    private final boolean mIsDemoMode;
+    @NonNull private final Set<String> mNoAttributionAnnotationPackages;
+
+    // TODO(b/201571677): Migrate the rest of the common objects to WifiTrackerInjector.
+    public WifiTrackerInjector(@NonNull Context context) {
+        mIsDemoMode = UserManager.isDeviceInDemoMode(context);
+        mNoAttributionAnnotationPackages = new ArraySet<>();
+        String[] noAttributionAnnotationPackages = context.getString(
+                R.string.wifitrackerlib_no_attribution_annotation_packages).split(",");
+        for (int i = 0; i < noAttributionAnnotationPackages.length; i++) {
+            mNoAttributionAnnotationPackages.add(noAttributionAnnotationPackages[i]);
+        }
+    }
+
+    public boolean isDemoMode() {
+        return mIsDemoMode;
+    }
+
+    /**
+     * Returns the set of package names which we should not show attribution annotations for.
+     */
+    @NonNull public Set<String> getNoAttributionAnnotationPackages() {
+        return mNoAttributionAnnotationPackages;
+    }
+}
diff --git a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/NetworkDetailsTrackerTest.java b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/NetworkDetailsTrackerTest.java
index ef2c003a2..9a3180828 100644
--- a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/NetworkDetailsTrackerTest.java
+++ b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/NetworkDetailsTrackerTest.java
@@ -50,25 +50,23 @@ public class NetworkDetailsTrackerTest {
     private static final long MAX_SCAN_AGE_MILLIS = 15_000;
     private static final long SCAN_INTERVAL_MILLIS = 10_000;
 
-    @Mock
-    private Lifecycle mMockLifecycle;
-    @Mock
-    private Context mMockContext;
-    @Mock
-    private WifiManager mMockWifiManager;
-    @Mock
-    private ConnectivityManager mMockConnectivityManager;
-    @Mock
-    private NetworkScoreManager mMockNetworkScoreManager;
-    @Mock
-    private Clock mMockClock;
+    @Mock private WifiTrackerInjector mInjector;
+    @Mock private Lifecycle mMockLifecycle;
+    @Mock private Context mMockContext;
+    @Mock private WifiManager mMockWifiManager;
+    @Mock private ConnectivityManager mMockConnectivityManager;
+    @Mock private NetworkScoreManager mMockNetworkScoreManager;
+    @Mock private Clock mMockClock;
 
     private TestLooper mTestLooper;
 
     private NetworkDetailsTracker createTestNetworkDetailsTracker(String key) {
         final Handler testHandler = new Handler(mTestLooper.getLooper());
 
-        return createNetworkDetailsTracker(mMockLifecycle, mMockContext,
+        return createNetworkDetailsTracker(
+                mInjector,
+                mMockLifecycle,
+                mMockContext,
                 mMockWifiManager,
                 mMockConnectivityManager,
                 mMockNetworkScoreManager,
diff --git a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/PasspointWifiEntryTest.java b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/PasspointWifiEntryTest.java
index f42b3d22c..42af91531 100644
--- a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/PasspointWifiEntryTest.java
+++ b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/PasspointWifiEntryTest.java
@@ -60,6 +60,7 @@ public class PasspointWifiEntryTest {
     public static final int OKAY_RSSI = -60;
     public static final int BAD_RSSI = -70;
 
+    @Mock private WifiTrackerInjector mMockInjector;
     @Mock private Context mMockContext;
     @Mock private WifiManager mMockWifiManager;
     @Mock private Resources mMockResources;
@@ -76,13 +77,6 @@ public class PasspointWifiEntryTest {
 
     @Before
     public void setUp() {
-        Utils.sFeatureFlagUtilsWrapper = new Utils.FeatureFlagUtilsWrapper() {
-            @Override
-            boolean isProviderModelEnabled(Context context) {
-                return false;
-            }
-        };
-
         MockitoAnnotations.initMocks(this);
 
         mTestLooper = new TestLooper();
@@ -106,8 +100,8 @@ public class PasspointWifiEntryTest {
         when(mMockResources.getString(R.string.wifitrackerlib_wifi_passpoint_expired))
                 .thenReturn(expired);
 
-        PasspointWifiEntry passpointWifiEntry = new PasspointWifiEntry(mMockContext, mTestHandler,
-                passpointConfiguration, mMockWifiManager, mMockScoreCache,
+        PasspointWifiEntry passpointWifiEntry = new PasspointWifiEntry(mMockInjector, mMockContext,
+                mTestHandler, passpointConfiguration, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
 
         assertThat(passpointWifiEntry.getSummary()).isNotEqualTo(expired);
@@ -119,8 +113,8 @@ public class PasspointWifiEntryTest {
         String expired = "Expired";
         when(mMockResources.getString(R.string.wifitrackerlib_wifi_passpoint_expired))
                 .thenReturn(expired);
-        PasspointWifiEntry passpointWifiEntry = new PasspointWifiEntry(mMockContext, mTestHandler,
-                passpointConfiguration, mMockWifiManager, mMockScoreCache,
+        PasspointWifiEntry passpointWifiEntry = new PasspointWifiEntry(mMockInjector, mMockContext,
+                mTestHandler, passpointConfiguration, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
         PasspointWifiEntry spyEntry = spy(passpointWifiEntry);
         when(spyEntry.isExpired()).thenReturn(true);
@@ -139,7 +133,7 @@ public class PasspointWifiEntryTest {
 
     @Test
     public void testGetMeteredChoice_afterSetMeteredChoice_getCorrectValue() {
-        PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+        PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
                 getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
 
@@ -172,7 +166,7 @@ public class PasspointWifiEntryTest {
                 new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0 /* subtype */, "WIFI", "");
         networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, "", "");
 
-        PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+        PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
                 getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
         entry.updateConnectionInfo(wifiInfo, networkInfo);
@@ -183,13 +177,7 @@ public class PasspointWifiEntryTest {
     }
 
     @Test
-    public void testGetSummary_providerModelConnectedButNotDefault_doesNotShowConnected() {
-        Utils.sFeatureFlagUtilsWrapper = new Utils.FeatureFlagUtilsWrapper() {
-            @Override
-            boolean isProviderModelEnabled(Context context) {
-                return true;
-            }
-        };
+    public void testGetSummary_connectedButNotDefault_doesNotShowConnected() {
         String summarySeparator = " / ";
         String[] wifiStatusArray = new String[]{"", "Scanning", "Connecting",
                 "Authenticating", "Obtaining IP address", "Connected"};
@@ -212,7 +200,7 @@ public class PasspointWifiEntryTest {
                 new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0 /* subtype */, "WIFI", "");
         networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, "", "");
 
-        PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+        PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
                 getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
         entry.updateConnectionInfo(wifiInfo, networkInfo);
@@ -232,7 +220,7 @@ public class PasspointWifiEntryTest {
                 new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0 /* subtype */, "WIFI", "");
         networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, "", "");
 
-        PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+        PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
                 getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
 
@@ -258,8 +246,8 @@ public class PasspointWifiEntryTest {
         when(mMockResources.getString(R.string.wifitrackerlib_wifi_security_passpoint))
                 .thenReturn(passpointSecurity);
 
-        PasspointWifiEntry passpointWifiEntry = new PasspointWifiEntry(mMockContext, mTestHandler,
-                passpointConfiguration, mMockWifiManager, mMockScoreCache,
+        PasspointWifiEntry passpointWifiEntry = new PasspointWifiEntry(mMockInjector, mMockContext,
+                mTestHandler, passpointConfiguration, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
 
         assertThat(passpointWifiEntry.getSecurityString(false)).isEqualTo(passpointSecurity);
@@ -279,7 +267,7 @@ public class PasspointWifiEntryTest {
                 new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0 /* subtype */, "WIFI", "");
         networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, "", "");
 
-        PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+        PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
                 getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
 
@@ -310,7 +298,7 @@ public class PasspointWifiEntryTest {
     @Test
     public void testGetSpeed_cacheUpdated_speedValueChanges() {
         when(mMockScoredNetwork.calculateBadge(GOOD_RSSI)).thenReturn(SPEED_FAST);
-        PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+        PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
                 getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
         WifiConfiguration wifiConfig = new WifiConfiguration();
@@ -334,7 +322,7 @@ public class PasspointWifiEntryTest {
         when(mMockWifiInfo.getRssi()).thenReturn(BAD_RSSI);
         when(mMockWifiInfo.getSSID()).thenReturn("\"ssid\"");
         when(mMockWifiInfo.getBSSID()).thenReturn("01:23:45:67:89:ab");
-        PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+        PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
                 getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
         WifiConfiguration wifiConfig = new WifiConfiguration();
@@ -352,7 +340,7 @@ public class PasspointWifiEntryTest {
     public void testGetSpeed_newScanResults_speedValueChanges() {
         when(mMockScoredNetwork.calculateBadge(BAD_RSSI)).thenReturn(SPEED_SLOW);
         when(mMockScoredNetwork.calculateBadge(GOOD_RSSI)).thenReturn(SPEED_FAST);
-        PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+        PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
                 getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
         WifiConfiguration wifiConfig = new WifiConfiguration();
@@ -384,7 +372,7 @@ public class PasspointWifiEntryTest {
         NetworkInfo networkInfo =
                 new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0 /* subtype */, "WIFI", "");
         networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, "", "");
-        PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+        PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
                 getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
 
@@ -395,7 +383,7 @@ public class PasspointWifiEntryTest {
 
     @Test
     public void testIsAutoJoinEnabled_nullConfigs_returnsFalse() {
-        PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+        PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
                 getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
 
@@ -406,7 +394,7 @@ public class PasspointWifiEntryTest {
 
     @Test
     public void testCanSignIn_captivePortalCapability_returnsTrue() {
-        PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+        PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
                 getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
 
@@ -421,7 +409,7 @@ public class PasspointWifiEntryTest {
     public void testUpdateNetworkCapabilities_userConnect_autoOpenCaptivePortalOnce() {
         when(mMockContext.getSystemService(Context.CONNECTIVITY_SERVICE))
                 .thenReturn(mMockConnectivityManager);
-        PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+        PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
                 getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
         NetworkCapabilities captivePortalCapabilities = new NetworkCapabilities.Builder()
@@ -463,7 +451,7 @@ public class PasspointWifiEntryTest {
         NetworkInfo networkInfo =
                 new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0 /* subtype */, "WIFI", "");
         networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, "", "");
-        PasspointWifiEntry entry = new PasspointWifiEntry(mMockContext, mTestHandler,
+        PasspointWifiEntry entry = new PasspointWifiEntry(mMockInjector, mMockContext, mTestHandler,
                 getPasspointConfiguration(), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
         entry.updateConnectionInfo(wifiInfo, networkInfo);
diff --git a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/SavedNetworkTrackerTest.java b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/SavedNetworkTrackerTest.java
index 89482b1c2..2f94587ae 100644
--- a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/SavedNetworkTrackerTest.java
+++ b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/SavedNetworkTrackerTest.java
@@ -63,20 +63,14 @@ public class SavedNetworkTrackerTest {
     private static final long MAX_SCAN_AGE_MILLIS = 15_000;
     private static final long SCAN_INTERVAL_MILLIS = 10_000;
 
-    @Mock
-    private Lifecycle mMockLifecycle;
-    @Mock
-    private Context mMockContext;
-    @Mock
-    private WifiManager mMockWifiManager;
-    @Mock
-    private ConnectivityManager mMockConnectivityManager;
-    @Mock
-    private NetworkScoreManager mMockNetworkScoreManager;
-    @Mock
-    private Clock mMockClock;
-    @Mock
-    private SavedNetworkTracker.SavedNetworkTrackerCallback mMockCallback;
+    @Mock private WifiTrackerInjector mInjector;
+    @Mock private Lifecycle mMockLifecycle;
+    @Mock private Context mMockContext;
+    @Mock private WifiManager mMockWifiManager;
+    @Mock private ConnectivityManager mMockConnectivityManager;
+    @Mock private NetworkScoreManager mMockNetworkScoreManager;
+    @Mock private Clock mMockClock;
+    @Mock private SavedNetworkTracker.SavedNetworkTrackerCallback mMockCallback;
 
     private TestLooper mTestLooper;
 
@@ -86,7 +80,10 @@ public class SavedNetworkTrackerTest {
     private SavedNetworkTracker createTestSavedNetworkTracker() {
         final Handler testHandler = new Handler(mTestLooper.getLooper());
 
-        return new SavedNetworkTracker(mMockLifecycle, mMockContext,
+        return new SavedNetworkTracker(
+                mInjector,
+                mMockLifecycle,
+                mMockContext,
                 mMockWifiManager,
                 mMockConnectivityManager,
                 mMockNetworkScoreManager,
diff --git a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardNetworkDetailsTrackerTest.java b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardNetworkDetailsTrackerTest.java
index ef124ad06..427670ff4 100644
--- a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardNetworkDetailsTrackerTest.java
+++ b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardNetworkDetailsTrackerTest.java
@@ -62,18 +62,13 @@ public class StandardNetworkDetailsTrackerTest {
     private static final long MAX_SCAN_AGE_MILLIS = 15_000;
     private static final long SCAN_INTERVAL_MILLIS = 10_000;
 
-    @Mock
-    private Lifecycle mMockLifecycle;
-    @Mock
-    private Context mMockContext;
-    @Mock
-    private WifiManager mMockWifiManager;
-    @Mock
-    private ConnectivityManager mMockConnectivityManager;
-    @Mock
-    private NetworkScoreManager mMockNetworkScoreManager;
-    @Mock
-    private Clock mMockClock;
+    @Mock private WifiTrackerInjector mInjector;
+    @Mock private Lifecycle mMockLifecycle;
+    @Mock private Context mMockContext;
+    @Mock private WifiManager mMockWifiManager;
+    @Mock private ConnectivityManager mMockConnectivityManager;
+    @Mock private NetworkScoreManager mMockNetworkScoreManager;
+    @Mock private Clock mMockClock;
 
     private TestLooper mTestLooper;
 
@@ -84,7 +79,10 @@ public class StandardNetworkDetailsTrackerTest {
             String key) {
         final Handler testHandler = new Handler(mTestLooper.getLooper());
 
-        return new StandardNetworkDetailsTracker(mMockLifecycle, mMockContext,
+        return new StandardNetworkDetailsTracker(
+                mInjector,
+                mMockLifecycle,
+                mMockContext,
                 mMockWifiManager,
                 mMockConnectivityManager,
                 mMockNetworkScoreManager,
diff --git a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardWifiEntryTest.java b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardWifiEntryTest.java
index 80aad2a8b..7c4467cfa 100644
--- a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardWifiEntryTest.java
+++ b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/StandardWifiEntryTest.java
@@ -98,6 +98,7 @@ public class StandardWifiEntryTest {
     @Mock private SubscriptionManager mSubscriptionManager;
     @Mock private WifiInfo mMockWifiInfo;
     @Mock private NetworkInfo mMockNetworkInfo;
+    @Mock private WifiTrackerInjector mMockInjector;
     @Mock private Context mMockContext;
     @Mock private NetworkScoreManager mMockNetworkScoreManager;
     @Mock private WifiNetworkScoreCache mMockScoreCache;
@@ -108,13 +109,6 @@ public class StandardWifiEntryTest {
 
     @Before
     public void setUp() {
-        Utils.sFeatureFlagUtilsWrapper = new Utils.FeatureFlagUtilsWrapper() {
-            @Override
-            boolean isProviderModelEnabled(Context context) {
-                return false;
-            }
-        };
-
         MockitoAnnotations.initMocks(this);
 
         mTestLooper = new TestLooper();
@@ -148,7 +142,8 @@ public class StandardWifiEntryTest {
     @Test
     public void testConstructor_mismatchedSsids_throwsException() {
         try {
-            new StandardWifiEntry(mMockContext, mTestHandler,
+            new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                     ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                     null, Arrays.asList(
                             buildScanResult("ssid0", "bssid0", 0, GOOD_RSSI),
@@ -165,7 +160,8 @@ public class StandardWifiEntryTest {
      */
     @Test
     public void testConstructor_scanResults_setsBestLevel() {
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 null, Arrays.asList(
                         buildScanResult("ssid", "bssid0", 0, GOOD_RSSI),
@@ -186,12 +182,14 @@ public class StandardWifiEntryTest {
         final ScanResult secureScan = buildScanResult("ssid", "bssid", 0, GOOD_RSSI);
         secureScan.capabilities = "EAP/SHA1";
 
-        final StandardWifiEntry unsecureEntry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry unsecureEntry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN,
                         true /* isTargetingNewNetworks */),
                 null, Arrays.asList(unsecureScan), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
-        final StandardWifiEntry secureEntry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry secureEntry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP,
                         true /* isTargetingNewNetworks */),
                 null, Arrays.asList(secureScan), mMockWifiManager, mMockScoreCache,
@@ -206,7 +204,8 @@ public class StandardWifiEntryTest {
      */
     @Test
     public void testUpdateScanResultInfo_mismatchedSsids_throwsException() {
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid0", SECURITY_TYPE_EAP),
                 null, Arrays.asList(buildScanResult("ssid0", "bssid0", 0, GOOD_RSSI)),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
@@ -225,7 +224,8 @@ public class StandardWifiEntryTest {
      */
     @Test
     public void testUpdateScanResultInfo_notifiesListener() {
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 null, Arrays.asList(buildScanResult("ssid", "bssid", 0)),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
@@ -242,7 +242,8 @@ public class StandardWifiEntryTest {
      */
     @Test
     public void testUpdateScanResultInfo_updatesLevel() {
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 null, Arrays.asList(buildScanResult("ssid", "bssid", 0, BAD_RSSI)),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
@@ -259,7 +260,8 @@ public class StandardWifiEntryTest {
         final WifiConfiguration config = new WifiConfiguration();
         config.SSID = "\"ssid\"";
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -272,7 +274,8 @@ public class StandardWifiEntryTest {
         final WifiConfiguration config = new WifiConfiguration();
         config.SSID = "\"ssid\"";
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -285,7 +288,8 @@ public class StandardWifiEntryTest {
         final WifiConfiguration config = new WifiConfiguration();
         config.SSID = "\"ssid\"";
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -305,7 +309,8 @@ public class StandardWifiEntryTest {
         final WifiConfiguration config = new WifiConfiguration();
         config.SSID = "\"ssid\"";
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_PSK);
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_PSK),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -324,7 +329,8 @@ public class StandardWifiEntryTest {
     public void testUpdateConfig_unsavedToSaved() {
         final ScanResult scan = buildScanResult("ssid", "bssid", 0, GOOD_RSSI);
         scan.capabilities = "EAP/SHA1";
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 null, Arrays.asList(scan), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -346,7 +352,8 @@ public class StandardWifiEntryTest {
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
         config.SSID = "\"ssid\"";
         config.networkId = 1;
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -364,7 +371,8 @@ public class StandardWifiEntryTest {
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
         config.SSID = "\"ssid\"";
         config.networkId = 1;
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -384,7 +392,8 @@ public class StandardWifiEntryTest {
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
         config.SSID = "\"ssid\"";
         config.networkId = 1;
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -401,7 +410,8 @@ public class StandardWifiEntryTest {
     @Test
     public void testConnect_savedNetwork_usesSavedConfig() {
         final ScanResult scan = buildScanResult("ssid", "bssid", 0, GOOD_RSSI);
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 null, Arrays.asList(scan), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -418,7 +428,8 @@ public class StandardWifiEntryTest {
     @Test
     public void testConnect_savedNetwork_usesSavedConfig_withOutSim() {
         final ScanResult scan = buildScanResult("ssid", "bssid", 0, GOOD_RSSI);
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 null, Arrays.asList(scan), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -440,7 +451,8 @@ public class StandardWifiEntryTest {
 
     @Test
     public void testConnect_openNetwork_callsConnect() {
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 null, Arrays.asList(buildScanResult("ssid", "bssid0", 0, GOOD_RSSI)),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
@@ -454,7 +466,8 @@ public class StandardWifiEntryTest {
     public void testConnect_unsavedSecureNetwork_returnsNoConfigFailure() {
         final ScanResult secureScan = buildScanResult("ssid", "bssid0", 0, GOOD_RSSI);
         secureScan.capabilities = "PSK";
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_PSK),
                 null, Arrays.asList(secureScan), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -479,7 +492,8 @@ public class StandardWifiEntryTest {
         when(spyConfig.getRandomizedMacAddress())
                 .thenReturn(MacAddress.fromString(randomizedMac));
 
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(spyConfig), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -498,7 +512,8 @@ public class StandardWifiEntryTest {
         config.networkId = 1;
         config.macRandomizationSetting = WifiConfiguration.RANDOMIZATION_NONE;
         when(mMockWifiManager.getFactoryMacAddresses()).thenReturn(new String[]{factoryMac});
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -525,7 +540,8 @@ public class StandardWifiEntryTest {
         config.networkId = networkId;
         config.macRandomizationSetting = WifiConfiguration.RANDOMIZATION_NONE;
         when(mMockWifiManager.getFactoryMacAddresses()).thenReturn(new String[]{factoryMac});
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -573,7 +589,8 @@ public class StandardWifiEntryTest {
         final ScanResult pskScanResult = buildScanResult("ssid", "bssid", 0, GOOD_RSSI);
         pskScanResult.capabilities = "PSK";
 
-        final StandardWifiEntry pskWifiEntry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry pskWifiEntry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey(pskScanResult.SSID, SECURITY_TYPE_PSK),
                 null, Arrays.asList(pskScanResult), mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -621,7 +638,8 @@ public class StandardWifiEntryTest {
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
         config.SSID = "\"ssid\"";
         config.networkId = 1;
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -639,7 +657,8 @@ public class StandardWifiEntryTest {
         final WifiConfiguration config = new WifiConfiguration();
         config.SSID = "\"ssid\"";
         config.setSecurityParams(wifiConfigurationSecureType);
-        return new StandardWifiEntry(mMockContext, mTestHandler,
+        return new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 new StandardWifiEntryKey(config), Collections.singletonList(config), null,
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
     }
@@ -671,7 +690,8 @@ public class StandardWifiEntryTest {
         final WifiConfiguration config = new WifiConfiguration();
         config.SSID = "\"ssid\"";
         config.networkId = networkId;
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -684,13 +704,7 @@ public class StandardWifiEntryTest {
     }
 
     @Test
-    public void testGetSummary_providerModelConnectedButNotDefault_doesNotShowConnected() {
-        Utils.sFeatureFlagUtilsWrapper = new Utils.FeatureFlagUtilsWrapper() {
-            @Override
-            boolean isProviderModelEnabled(Context context) {
-                return true;
-            }
-        };
+    public void testGetSummary_connectedButNotDefault_doesNotShowConnected() {
         final int networkId = 1;
         final String summarySeparator = " / ";
         final String[] wifiStatusArray = new String[]{"", "Scanning", "Connecting",
@@ -716,7 +730,8 @@ public class StandardWifiEntryTest {
         final WifiConfiguration config = new WifiConfiguration();
         config.SSID = "\"ssid\"";
         config.networkId = networkId;
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -743,7 +758,8 @@ public class StandardWifiEntryTest {
         config.SSID = "\"ssid\"";
         config.networkId = networkId;
 
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 Collections.singletonList(config), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -792,7 +808,8 @@ public class StandardWifiEntryTest {
         ScanResult saeScan = buildScanResult("ssid", "bssid0", 0, BAD_RSSI);
         saeScan.capabilities = "SAE";
 
-        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_PSK),
                 Arrays.asList(pskConfig, saeConfig), Arrays.asList(pskScan, saeScan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
@@ -830,7 +847,8 @@ public class StandardWifiEntryTest {
         when(mMockWifiInfo.getRssi()).thenReturn(GOOD_RSSI);
         when(mMockNetworkInfo.getDetailedState()).thenReturn(NetworkInfo.DetailedState.CONNECTED);
 
-        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_PSK),
                 Arrays.asList(pskConfig, saeConfig), Arrays.asList(pskScan, saeScan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
@@ -870,7 +888,8 @@ public class StandardWifiEntryTest {
         final ScanResult eapWpa3Scan = buildScanResult("ssid", "bssid", 0, GOOD_RSSI);
         eapWpa3Scan.capabilities = "[RSN-EAP/SHA256][MFPR][MFPC]";
 
-        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Arrays.asList(eapConfig, eapWpa3Config), Arrays.asList(eapScan, eapWpa3Scan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
@@ -891,7 +910,8 @@ public class StandardWifiEntryTest {
 
     @Test
     public void testCanSignIn_captivePortalCapability_returnsTrue() {
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 null, Arrays.asList(
                         buildScanResult("ssid", "bssid0", 0, GOOD_RSSI)),
@@ -907,7 +927,8 @@ public class StandardWifiEntryTest {
     public void testUpdateNetworkCapabilities_userConnect_autoOpenCaptivePortalOnce() {
         when(mMockContext.getSystemService(Context.CONNECTIVITY_SERVICE))
                 .thenReturn(mMockConnectivityManager);
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 null, Arrays.asList(
                         buildScanResult("ssid", "bssid0", 0, GOOD_RSSI)),
@@ -930,7 +951,8 @@ public class StandardWifiEntryTest {
 
     @Test
     public void testShouldEditBeforeConnect_nullWifiConfig_returnFalse() {
-        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
 
@@ -943,7 +965,8 @@ public class StandardWifiEntryTest {
         WifiConfiguration wifiConfig = new WifiConfiguration();
         wifiConfig.SSID = "\"ssid\"";
         wifiConfig.setSecurityParams(WifiConfiguration.SECURITY_TYPE_OPEN);
-        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 Collections.singletonList(wifiConfig), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -952,7 +975,8 @@ public class StandardWifiEntryTest {
 
         // Test enhanced open networks.
         wifiConfig.setSecurityParams(WifiConfiguration.SECURITY_TYPE_OWE);
-        entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OWE),
                 Collections.singletonList(wifiConfig), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -966,7 +990,8 @@ public class StandardWifiEntryTest {
         WifiConfiguration wifiConfig = spy(new WifiConfiguration());
         wifiConfig.SSID = "\"ssid\"";
         wifiConfig.setSecurityParams(WifiConfiguration.SECURITY_TYPE_PSK);
-        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_PSK),
                 Collections.singletonList(wifiConfig), null, mMockWifiManager, mMockScoreCache,
                 false /* forSavedNetworksPage */);
@@ -1007,7 +1032,8 @@ public class StandardWifiEntryTest {
     @Test
     public void testGetSpeed_cacheUpdated_speedValueChanges() {
         when(mMockScoredNetwork.calculateBadge(GOOD_RSSI)).thenReturn(SPEED_FAST);
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 null, Collections.singletonList(buildScanResult("ssid", "bssid0", 0, GOOD_RSSI)),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
@@ -1029,7 +1055,8 @@ public class StandardWifiEntryTest {
         final WifiConfiguration config = new WifiConfiguration();
         config.SSID = "\"ssid\"";
         config.networkId = 1;
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 Collections.singletonList(config), Collections.singletonList(
                         buildScanResult("ssid", "bssid0", 0, GOOD_RSSI)), mMockWifiManager,
@@ -1044,7 +1071,8 @@ public class StandardWifiEntryTest {
     public void testGetSpeed_newScanResults_speedValueChanges() {
         when(mMockScoredNetwork.calculateBadge(BAD_RSSI)).thenReturn(SPEED_SLOW);
         when(mMockScoredNetwork.calculateBadge(GOOD_RSSI)).thenReturn(SPEED_FAST);
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        final StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 null, Collections.singletonList(buildScanResult("ssid", "bssid0", 0, GOOD_RSSI)),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
@@ -1058,7 +1086,8 @@ public class StandardWifiEntryTest {
     @Test
     public void testCanConnect_nonEapMethod_returnTrueIfReachable() {
         ScanResult scan = buildScanResult("ssid", "bssid0", 0, GOOD_RSSI);
-        StandardWifiEntry spyEntry = spy(new StandardWifiEntry(mMockContext, mTestHandler,
+        StandardWifiEntry spyEntry = spy(new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN),
                 null, Arrays.asList(buildScanResult("ssid", "bssid0", 0, GOOD_RSSI)),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */));
@@ -1067,7 +1096,8 @@ public class StandardWifiEntryTest {
         assertThat(spyEntry.canConnect()).isEqualTo(true);
 
         scan.capabilities = "OWE";
-        spyEntry = spy(new StandardWifiEntry(mMockContext, mTestHandler,
+        spyEntry = spy(new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OWE),
                 null, Collections.singletonList(scan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */));
@@ -1076,7 +1106,8 @@ public class StandardWifiEntryTest {
         assertThat(spyEntry.canConnect()).isEqualTo(true);
 
         scan.capabilities = "WEP";
-        spyEntry = spy(new StandardWifiEntry(mMockContext, mTestHandler,
+        spyEntry = spy(new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_WEP),
                 null, Collections.singletonList(scan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */));
@@ -1085,7 +1116,8 @@ public class StandardWifiEntryTest {
         assertThat(spyEntry.canConnect()).isEqualTo(true);
 
         scan.capabilities = "PSK";
-        spyEntry = spy(new StandardWifiEntry(mMockContext, mTestHandler,
+        spyEntry = spy(new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_PSK),
                 null, Collections.singletonList(scan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */));
@@ -1094,7 +1126,8 @@ public class StandardWifiEntryTest {
         assertThat(spyEntry.canConnect()).isEqualTo(true);
 
         scan.capabilities = "SAE";
-        spyEntry = spy(new StandardWifiEntry(mMockContext, mTestHandler,
+        spyEntry = spy(new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_SAE),
                 null, Collections.singletonList(scan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */));
@@ -1113,7 +1146,8 @@ public class StandardWifiEntryTest {
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
         ScanResult scan = buildScanResult("ssid", "bssid0", 0, GOOD_RSSI);
         scan.capabilities = "EAP/SHA1";
-        StandardWifiEntry spyEntry = spy(new StandardWifiEntry(mMockContext, mTestHandler,
+        StandardWifiEntry spyEntry = spy(new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), Collections.singletonList(scan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */));
@@ -1133,7 +1167,8 @@ public class StandardWifiEntryTest {
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
         ScanResult scan = buildScanResult("ssid", "bssid0", 0, GOOD_RSSI);
         scan.capabilities = "EAP/SHA1";
-        StandardWifiEntry spyEntry = spy(new StandardWifiEntry(mMockContext, mTestHandler,
+        StandardWifiEntry spyEntry = spy(new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), Collections.singletonList(scan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */));
@@ -1156,7 +1191,8 @@ public class StandardWifiEntryTest {
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
         ScanResult scan = buildScanResult("ssid", "bssid0", 0, GOOD_RSSI);
         scan.capabilities = "EAP/SHA1";
-        StandardWifiEntry spyEntry = spy(new StandardWifiEntry(mMockContext, mTestHandler,
+        StandardWifiEntry spyEntry = spy(new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), Collections.singletonList(scan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */));
@@ -1182,7 +1218,8 @@ public class StandardWifiEntryTest {
         config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
         ScanResult scan = buildScanResult("ssid", "bssid0", 0, GOOD_RSSI);
         scan.capabilities = "EAP/SHA1";
-        StandardWifiEntry spyEntry = spy(new StandardWifiEntry(mMockContext, mTestHandler,
+        StandardWifiEntry spyEntry = spy(new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP),
                 Collections.singletonList(config), Collections.singletonList(scan),
                 mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */));
@@ -1231,7 +1268,8 @@ public class StandardWifiEntryTest {
         pskScan.capabilities = "PSK";
         ScanResult saeScan = buildScanResult("ssid", "bssid0", 0, BAD_RSSI);
         saeScan.capabilities = "SAE";
-        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_PSK,
                         true /* isTargetingNewNetwork */),
                 Collections.singletonList(pskConfig), Arrays.asList(pskScan, saeScan),
@@ -1258,7 +1296,8 @@ public class StandardWifiEntryTest {
     public void testConnect_unsavedOpen_configuresOpenNetwork() {
         ScanResult openScan = buildScanResult("ssid", "bssid0", 0, GOOD_RSSI);
         openScan.capabilities = "";
-        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN,
                         true /* isTargetingNewNetworks */),
                 null, Collections.singletonList(openScan),
@@ -1277,7 +1316,8 @@ public class StandardWifiEntryTest {
     public void testConnect_unsavedOwe_configuresOweNetwork() {
         ScanResult oweScan = buildScanResult("ssid", "bssid0", 0, BAD_RSSI);
         oweScan.capabilities = "OWE";
-        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OWE,
                         true /* isTargetingNewNetworks */),
                 null, Collections.singletonList(oweScan),
@@ -1296,7 +1336,8 @@ public class StandardWifiEntryTest {
     public void testConnect_unsavedOpenOwe_configuresOweAndOpenNetwork() {
         ScanResult oweTransitionScan = buildScanResult("ssid", "bssid0", 0, BAD_RSSI);
         oweTransitionScan.capabilities = "OWE_TRANSITION";
-        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN,
                         true /* isTargetingNewNetworks */),
                 null, Collections.singletonList(oweTransitionScan),
@@ -1325,7 +1366,8 @@ public class StandardWifiEntryTest {
         oweConfig.SSID = "\"ssid\"";
         oweConfig.setSecurityParams(WifiConfiguration.SECURITY_TYPE_OWE);
 
-        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_OPEN,
                         true /* isTargetingNewNetwork */),
                 Arrays.asList(openConfig, oweConfig), null,
@@ -1344,7 +1386,8 @@ public class StandardWifiEntryTest {
         saeConfig.SSID = "\"ssid\"";
         saeConfig.setSecurityParams(WifiConfiguration.SECURITY_TYPE_SAE);
 
-        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_PSK,
                         true /* isTargetingNewNetwork */),
                 Arrays.asList(pskConfig, saeConfig), null,
@@ -1363,7 +1406,8 @@ public class StandardWifiEntryTest {
         eapWpa3Config.SSID = "\"ssid\"";
         eapWpa3Config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_WPA3_ENTERPRISE);
 
-        StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
+        StandardWifiEntry entry = new StandardWifiEntry(
+                mMockInjector, mMockContext, mTestHandler,
                 ssidAndSecurityTypeToStandardWifiEntryKey("ssid", SECURITY_TYPE_EAP,
                         true /* isTargetingNewNetwork */),
                 Arrays.asList(eapConfig, eapWpa3Config), null,
@@ -1372,4 +1416,25 @@ public class StandardWifiEntryTest {
         assertThat(entry.getSecurity()).isEqualTo(WifiEntry.SECURITY_EAP);
         assertThat(entry.getWifiConfiguration()).isEqualTo(eapConfig);
     }
+
+    @Test
+    public void testCanShare_isDemoMode_returnsFalse() {
+        when(mMockInjector.isDemoMode()).thenReturn(true);
+
+        final StandardWifiEntry pskWifiEntry =
+                getSavedStandardWifiEntry(WifiConfiguration.SECURITY_TYPE_PSK);
+
+        assertThat(pskWifiEntry.canShare()).isFalse();
+    }
+
+    @Test
+    public void testCanEasyConnect_isDemoMode_returnsFalse() {
+        when(mMockInjector.isDemoMode()).thenReturn(true);
+
+        final StandardWifiEntry pskWifiEntry =
+                getSavedStandardWifiEntry(WifiConfiguration.SECURITY_TYPE_PSK);
+
+        assertThat(pskWifiEntry.canEasyConnect()).isFalse();
+    }
+
 }
diff --git a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/UtilsTest.java b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/UtilsTest.java
index 73137feb2..4e25288f4 100644
--- a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/UtilsTest.java
+++ b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/UtilsTest.java
@@ -37,12 +37,18 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
+import android.content.ContentResolver;
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.net.NetworkInfo;
 import android.net.NetworkScoreManager;
@@ -79,6 +85,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 @Config(shadows = {ShadowSystem.class})
 public class UtilsTest {
@@ -94,10 +101,15 @@ public class UtilsTest {
 
     private static final String TEST_CARRIER_NAME = "carrierName";
 
+    @Mock private WifiTrackerInjector mMockInjector;
     @Mock private Context mMockContext;
     @Mock private Resources mMockResources;
+    @Mock private PackageManager mPackageManager;
+    @Mock private ApplicationInfo mApplicationInfo;
+    @Mock private ContentResolver mContentResolver;
     @Mock private NetworkScoreManager mMockNetworkScoreManager;
     @Mock private WifiNetworkScoreCache mMockScoreCache;
+    @Mock private WifiManager mMockWifiManager;
     @Mock private SubscriptionManager mSubscriptionManager;
     @Mock private TelephonyManager mTelephonyManager;
     @Mock private CarrierConfigManager mCarrierConfigManager;
@@ -106,7 +118,7 @@ public class UtilsTest {
     private Handler mTestHandler;
 
     @Before
-    public void setUp() {
+    public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
 
         TestLooper testLooper = new TestLooper();
@@ -114,6 +126,7 @@ public class UtilsTest {
         when(mMockContext.getResources()).thenReturn(mMockResources);
         when(mMockContext.getSystemService(Context.NETWORK_SCORE_SERVICE))
                 .thenReturn(mMockNetworkScoreManager);
+        when(mMockContext.getString(R.string.wifitrackerlib_summary_separator)).thenReturn("/");
         when(mMockContext.getSystemService(Context.CARRIER_CONFIG_SERVICE))
                 .thenReturn(mCarrierConfigManager);
         when(mMockContext.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE))
@@ -121,6 +134,12 @@ public class UtilsTest {
         when(mMockContext.getSystemService(Context.TELEPHONY_SERVICE))
                 .thenReturn(mTelephonyManager);
         when(mTelephonyManager.createForSubscriptionId(TEST_CARRIER_ID)).thenReturn(mSpecifiedTm);
+        when(mMockContext.getPackageManager()).thenReturn(mPackageManager);
+        when(mPackageManager.getApplicationInfo(anyString(), anyInt()))
+                .thenReturn(mApplicationInfo);
+        when(mMockContext.getContentResolver()).thenReturn(mContentResolver);
+        when(mContentResolver.getUserId()).thenReturn(0);
+        when(mMockInjector.getNoAttributionAnnotationPackages()).thenReturn(Collections.emptySet());
     }
 
     @Test
@@ -273,6 +292,16 @@ public class UtilsTest {
     }
 
     @Test
+    public void testCheckSimPresentWithUnknownCarrierId() {
+        List<SubscriptionInfo> subscriptionInfoList = new ArrayList<>();
+        SubscriptionInfo subscriptionInfo = mock(SubscriptionInfo.class);
+        when(subscriptionInfo.getCarrierId()).thenReturn(TEST_CARRIER_ID);
+        subscriptionInfoList.add(subscriptionInfo);
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(subscriptionInfoList);
+        assertTrue(isSimPresent(mMockContext, TelephonyManager.UNKNOWN_CARRIER_ID));
+    }
+
+    @Test
     public void testGetCarrierName() {
         when(mSpecifiedTm.getSimCarrierIdName()).thenReturn(TEST_CARRIER_NAME);
         assertEquals(TEST_CARRIER_NAME, getCarrierNameForSubId(mMockContext, TEST_CARRIER_ID));
@@ -490,12 +519,36 @@ public class UtilsTest {
                 WifiInfo.SECURITY_TYPE_WAPI_CERT);
     }
 
+    @Test
+    public void testDisconnectedDescription_noAttributionAnnotationPackage_returnsEmpty() {
+        String savedByAppLabel = "Saved by app label";
+        String appLabel = "app label";
+        when(mApplicationInfo.loadLabel(any())).thenReturn(appLabel);
+        when(mMockContext.getString(R.string.wifitrackerlib_saved_network, appLabel))
+                .thenReturn(savedByAppLabel);
+        String normalPackage = "normalPackage";
+        String noAttributionPackage = "noAttributionPackage";
+        when(mMockInjector.getNoAttributionAnnotationPackages())
+                .thenReturn(Set.of(noAttributionPackage));
+
+        // Normal package should display the summary "Saved by <app label>" in Saved Networks
+        WifiConfiguration normalConfig = new WifiConfiguration();
+        normalConfig.creatorName = normalPackage;
+        assertThat(Utils.getDisconnectedDescription(
+                mMockInjector, mMockContext, normalConfig, true, false)).isEqualTo(
+                        savedByAppLabel);
+
+        // No-attribution package should display a blank summary in Saved Networks
+        WifiConfiguration noAttributionConfig = new WifiConfiguration();
+        noAttributionConfig.creatorName = noAttributionPackage;
+        assertThat(Utils.getDisconnectedDescription(
+                mMockInjector, mMockContext, noAttributionConfig, true, false)).isEmpty();
+    }
 
     private StandardWifiEntry getStandardWifiEntry(WifiConfiguration config) {
-        final WifiManager mockWifiManager = mock(WifiManager.class);
-        final StandardWifiEntry entry = new StandardWifiEntry(mMockContext, mTestHandler,
-                new StandardWifiEntryKey(config), Collections.singletonList(config),
-                null, mockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
+        final StandardWifiEntry entry = new StandardWifiEntry(mMockInjector, mMockContext,
+                mTestHandler, new StandardWifiEntryKey(config), Collections.singletonList(config),
+                null, mMockWifiManager, mMockScoreCache, false /* forSavedNetworksPage */);
         final WifiInfo mockWifiInfo = mock(WifiInfo.class);
         final NetworkInfo mockNetworkInfo = mock(NetworkInfo.class);
 
diff --git a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/WifiPickerTrackerTest.java b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/WifiPickerTrackerTest.java
index dd487e9f6..1e8fa6ee9 100644
--- a/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/WifiPickerTrackerTest.java
+++ b/libs/WifiTrackerLib/tests/src/com/android/wifitrackerlib/WifiPickerTrackerTest.java
@@ -25,7 +25,6 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -79,30 +78,19 @@ public class WifiPickerTrackerTest {
     private static final long MAX_SCAN_AGE_MILLIS = 15_000;
     private static final long SCAN_INTERVAL_MILLIS = 10_000;
 
-    @Mock
-    private Lifecycle mMockLifecycle;
-    @Mock
-    private Context mMockContext;
-    @Mock
-    private Resources mMockResources;
-    @Mock
-    private WifiManager mMockWifiManager;
-    @Mock
-    private ConnectivityManager mMockConnectivityManager;
-    @Mock
-    private NetworkScoreManager mMockNetworkScoreManager;
-    @Mock
-    private TelephonyManager mMockTelephonyManager;
-    @Mock
-    private Clock mMockClock;
-    @Mock
-    private WifiPickerTracker.WifiPickerTrackerCallback mMockCallback;
-    @Mock
-    private WifiInfo mMockWifiInfo;
-    @Mock
-    private NetworkInfo mMockNetworkInfo;
-    @Mock
-    private Network mMockNetwork;
+    @Mock private WifiTrackerInjector mInjector;
+    @Mock private Lifecycle mMockLifecycle;
+    @Mock private Context mMockContext;
+    @Mock private Resources mMockResources;
+    @Mock private WifiManager mMockWifiManager;
+    @Mock private ConnectivityManager mMockConnectivityManager;
+    @Mock private NetworkScoreManager mMockNetworkScoreManager;
+    @Mock private TelephonyManager mMockTelephonyManager;
+    @Mock private Clock mMockClock;
+    @Mock private WifiPickerTracker.WifiPickerTrackerCallback mMockCallback;
+    @Mock private WifiInfo mMockWifiInfo;
+    @Mock private NetworkInfo mMockNetworkInfo;
+    @Mock private Network mMockNetwork;
 
     private TestLooper mTestLooper;
 
@@ -118,7 +106,10 @@ public class WifiPickerTrackerTest {
     private WifiPickerTracker createTestWifiPickerTracker() {
         final Handler testHandler = new Handler(mTestLooper.getLooper());
 
-        return new WifiPickerTracker(mMockLifecycle, mMockContext,
+        return new WifiPickerTracker(
+                mInjector,
+                mMockLifecycle,
+                mMockContext,
                 mMockWifiManager,
                 mMockConnectivityManager,
                 mMockNetworkScoreManager,
@@ -132,13 +123,6 @@ public class WifiPickerTrackerTest {
 
     @Before
     public void setUp() {
-        Utils.sFeatureFlagUtilsWrapper = new Utils.FeatureFlagUtilsWrapper() {
-            @Override
-            boolean isProviderModelEnabled(Context context) {
-                return false;
-            }
-        };
-
         MockitoAnnotations.initMocks(this);
 
         mTestLooper = new TestLooper();
@@ -1326,4 +1310,50 @@ public class WifiPickerTrackerTest {
         // Now VCN-over-Wifi is default, so isDefaultNetwork returns true
         assertThat(mergedCarrierEntry.isDefaultNetwork()).isTrue();
     }
+
+    /**
+     * Tests that roaming from one network to another will update the new network as the default
+     * network if the default route did not change away from Wifi during the roam. This happens if
+     * the new network was switched to via MBB.
+     */
+    @Test
+    public void testGetConnectedEntry_roamedButDefaultRouteDidNotChange_entryIsDefaultNetwork() {
+        final WifiPickerTracker wifiPickerTracker = createTestWifiPickerTracker();
+        final WifiConfiguration config1 = new WifiConfiguration();
+        config1.SSID = "\"ssid1\"";
+        config1.networkId = 1;
+        final WifiConfiguration config2 = new WifiConfiguration();
+        config2.SSID = "\"ssid2\"";
+        config2.networkId = 2;
+        when(mMockWifiManager.getPrivilegedConfiguredNetworks())
+                .thenReturn(Arrays.asList(config1, config2));
+        when(mMockWifiInfo.getNetworkId()).thenReturn(1);
+        when(mMockWifiInfo.getRssi()).thenReturn(-50);
+        when(mMockNetworkInfo.getDetailedState()).thenReturn(NetworkInfo.DetailedState.CONNECTED);
+        wifiPickerTracker.onStart();
+        mTestLooper.dispatchAll();
+        verify(mMockContext).registerReceiver(mBroadcastReceiverCaptor.capture(),
+                any(), any(), any());
+        verify(mMockConnectivityManager)
+                .registerDefaultNetworkCallback(mDefaultNetworkCallbackCaptor.capture(), any());
+        // Set the default route to wifi
+        mDefaultNetworkCallbackCaptor.getValue().onCapabilitiesChanged(mMockNetwork,
+                new NetworkCapabilities.Builder()
+                        .addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
+                        .build());
+        WifiEntry connectedEntry = wifiPickerTracker.getConnectedWifiEntry();
+        assertThat(connectedEntry.getWifiConfiguration()).isEqualTo(config1);
+        assertThat(connectedEntry.isDefaultNetwork()).isTrue();
+
+        // Connect to new network but don't change the default route
+        when(mMockWifiInfo.getNetworkId()).thenReturn(2);
+        mBroadcastReceiverCaptor.getValue().onReceive(mMockContext,
+                new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION)
+                        .putExtra(WifiManager.EXTRA_NETWORK_INFO, mMockNetworkInfo));
+
+        // Verify that the newly connected network is still marked as the default network
+        connectedEntry = wifiPickerTracker.getConnectedWifiEntry();
+        assertThat(connectedEntry.getWifiConfiguration()).isEqualTo(config2);
+        assertThat(wifiPickerTracker.getConnectedWifiEntry().isDefaultNetwork()).isTrue();
+    }
 }
author	Xin Li <delphij@google.com>	2022-02-11 06:57:37 +0000
committer	Xin Li <delphij@google.com>	2022-02-11 06:57:37 +0000
commit	824ec7c60083a79b0136d4dfd0aac04a3ba296fe (patch)
tree	68c3942bf24ead4eee953b51296cd0a590f4106b
parent	d6bb1970060701be28ceb83d45979c74b0176bf8 (diff)
parent	ee9b6270e2011e4e90f7043d7794d4c6bdb91154 (diff)
download	wifi-sam_222710654.tar.gz