From 78c924157878c7730f5749c470b0a94ce699b357 Mon Sep 17 00:00:00 2001
From: XichengSpencer <styleclub16@gmail.com>
Date: Sun, 27 Oct 2024 17:52:21 -0400
Subject: [PATCH 1/6] Fix Lint Error for BUILD.bazel

---
 .../src/test/java/org/oppia/android/util/logging/BUILD.bazel    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel b/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel
index 318e1584f52..d23fb656a4c 100644
--- a/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel
+++ b/utility/src/test/java/org/oppia/android/util/logging/BUILD.bazel
@@ -127,4 +127,4 @@ oppia_android_test(
         "//third_party:org_robolectric_robolectric",
         "//third_party:robolectric_android-all",
     ],
-)
\ No newline at end of file
+)

From f7e46519f54ef37871cefce27de1812bf4510493 Mon Sep 17 00:00:00 2001
From: "translatewiki.net" <l10n-bot@translatewiki.net>
Date: Mon, 28 Oct 2024 20:05:34 +0530
Subject: [PATCH 2/6] Localisation updates from https://translatewiki.net.
 (#5274)

Translation updates
---
 app/src/main/res/values-ar/strings.xml      |  37 ++++--
 app/src/main/res/values-pcm-rNG/strings.xml |  23 ++--
 app/src/main/res/values-pt-rBR/strings.xml  | 135 +++++++++++++++++---
 app/src/main/res/values-sw/strings.xml      |  19 ++-
 4 files changed, 157 insertions(+), 57 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 81bca583bed..37238d2f821 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -4,10 +4,11 @@
 * Meno25
 * MohamedMedhat
 * Mouradeq
+* SamarBenNafa
 * Sarah zoubida
 * Seanlip
 -->
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
   <string name="nav_header_desc">أعلى قائمة التنقل</string>
   <string name="menu_options">خيارات</string>
   <string name="menu_my_downloads">التنزيلات</string>
@@ -167,7 +168,7 @@
   <string name="fraction_error_larger_than_seven_digits">لا يجب أن يحتوي أي رقم في الكسر العشري على أكثر من 7 أرقام.</string>
   <string name="number_error_starting_with_floating_point">من فضلك إبدأ إجابتك برقم (0 او 0.5 على سبيل المثال)</string>
   <string name="number_error_invalid_format">من فضلك قم بإدخال رقم صالح.</string>
-  <string name="number_error_larger_than_fifteen_characters" tools:ignore="TypographyDashes">(&#8211;يمكن أن تحتوي الإجابة على 15 رقمًا (0-9) على الأكثر أو الرموز (. أو</string>
+  <string name="number_error_larger_than_fifteen_characters">(–يمكن أن تحتوي الإجابة على 15 رقمًا (0-9) على الأكثر أو الرموز (. أو</string>
   <string name="ratio_error_invalid_chars" fuzzy="true">من فضلك قم بكتابة نسبة تتكون من أرقام مفصولة بنقطتين رأسيتين (1:2 أو 1:2:3 على سبيل المثال).</string>
   <string name="ratio_error_invalid_format" fuzzy="true">من فضلك أدخل نسبة صحيحة (1:2 أو 1:2:3 على سبيل المثال)</string>
   <string name="ratio_error_invalid_colons" fuzzy="true">إجابتك تحتوي على نقطتين رأسيتين (:) متتاليتين.</string>
@@ -411,7 +412,7 @@
   <string name="great">عظيم</string>
   <string name="lets_get_started">هيّا نبدأ.</string>
   <string name="yes">نعم</string>
-  <string name="no">&#8230;لا</string>
+  <string name="no">…لا</string>
   <string name="pick_a_different_topic">اختر موضوعًا\nآخرًا.</string>
   <string name="are_you_interested">هل أنت مهتم بـ:\n%s</string>
   <string name="new_hint_available">ملاحظة جديدة متاحة</string>
@@ -456,11 +457,11 @@
   <string name="beta_notice_dialog_title">إشعار بيتا</string>
   <string name="beta_notice_dialog_message">مرحبًا! يتم الآن تحديث تطبيقك إلى الإصدار التجريبي. إذا واجهت مشاكل أثناء استخدام التطبيق ، أو كانت لديك أسئلة ، فيرجى الاتصال بنا على android-feedback@oppia.org.</string>
   <string name="beta_notice_dialog_do_not_show_again_text">لا تظهر هذه الرسالة مرة أخرى</string>
-  <string name="beta_notice_dialog_close_button_text">نعم</string>
+  <string name="beta_notice_dialog_close_button_text" fuzzy="true">نعم</string>
   <string name="general_availability_notice_dialog_title">إشعار التوفر العام</string>
   <string name="general_availability_notice_dialog_message">مرحبًا! يتم الآن تحديث تطبيقك إلى إصدار التوفر العام. إذا واجهت مشاكل أثناء استخدام التطبيق ، أو كانت لديك أسئلة ، فيرجى الاتصال بنا على android-feedback@oppia.org.</string>
   <string name="general_availability_notice_dialog_do_not_show_again_text">لا تظهر هذه الرسالة مرة أخرى</string>
-  <string name="general_availability_notice_dialog_close_button_text">نعم</string>
+  <string name="general_availability_notice_dialog_close_button_text" fuzzy="true">نعم</string>
   <string name="ratio_content_description_separator" fuzzy="true">إلى</string>
   <string name="ratio_default_hint_text" fuzzy="true">أدخل نسبة في الصيغة س:ص.</string>
   <string name="text_input_default_hint_text">انقر هنا لإدخال نص.</string>
@@ -498,19 +499,31 @@
   <string name="terms_of_service_title">شروط الخدمة</string>
   <string name="agree_to_terms">باستخدام %s ، فإنك توافق على&lt;br&gt;&lt;oppia-noninteractive-policy link=\"tos\"&gt; شروط الخدمة&lt;/oppia-noninteractive-policy&gt; و&lt;oppia-noninteractive-policy link=\"privacy\"&gt; سياسة الخصوصية&lt;/oppia-noninteractive-policy&gt; .</string>
   <string name="terms_of_service_web_link">يرجى زيارة &lt;a href=\"https://www.oppia.org/terms\"&gt;هذه الصفحة&lt;/a&gt; للحصول على أحدث نسخة من هذه الشروط.</string>
-  <string name="faq_question_create_profile">كيف يمكنني إنشاء ملف تعريف(حساب) جديد؟</string>
-  <string name="faq_question_delete_profile">كيف يمكنني حذف ملف التعريف(حساب)؟</string>
   <string name="faq_question_whats_oppia">ما هي %s؟</string>
   <string name="faq_question_whos_an_admin">من هو المشرف؟</string>
+  <string name="faq_question_create_profile">كيف يمكنني إنشاء ملف تعريف(حساب) جديد؟</string>
+  <string name="faq_question_app_language" fuzzy="true">كيف يمكنني الحصول على التطبيق بلغتي؟</string>
+  <string name="faq_question_bug_reporting" fuzzy="true">وجدت خلل. كيف يمكنني الإبلاغ عنه؟</string>
+  <string name="faq_question_math_lessons" fuzzy="true">لماذا هناك فقط دروس رياضيات؟</string>
+  <string name="faq_question_more_lessons" fuzzy="true">هل ستقومون بإنشاء مزيد من الدروس؟</string>
   <string name="faq_question_exploration_player">لماذا لا يتم تحميل مشغل الاستكشاف؟</string>
   <string name="faq_question_audio_not_playing">لماذا لا يتم تشغيل الصوت الخاص بي؟</string>
+  <string name="faq_question_delete_profile">كيف يمكنني حذف ملف التعريف(حساب)؟</string>
+  <string name="faq_question_update_app" fuzzy="true">كيف يمكنني تحديث التطبيق؟</string>
+  <string name="faq_question_update_os" fuzzy="true">كيف يمكنني تحديث نظام التشغيل Android الخاص بي؟</string>
   <string name="faq_question_cant_find_question">لا أجد سؤالي هنا.  ماذا الان؟</string>
-  <string name="faq_answer_create_profile">&lt;p&gt;إذا كانت هذه هي المرة الأولى التي تنشئ فيها ملفًا شخصيًا وليس لديك رقم تعريف شخصي: &lt;ol&gt;&lt;li&gt; من منتقي الملف الشخصي ، اضغط على&lt;strong&gt; قم بإعداد ملفات تعريف متعددة&lt;/strong&gt;&lt;/li&gt;&lt;li&gt; قم بإنشاء رقم تعريف شخصي و&lt;strong&gt;احفظ&lt;/strong&gt;&lt;/li&gt;&lt;li&gt; املأ جميع البيانات للملف الشخصي.&lt;ol&gt;&lt;li&gt;(اختياري) قم بتحميل صورة.&lt;/li&gt; &lt;li&gt;إدخال اسم.&lt;/li&gt; &lt;li&gt;(اختياري) قم بتعيين رقم تعريف شخصي مكون من 3 أرقام.&lt;/li&gt;&lt;/ol&gt;&lt;/li&gt;&lt;li&gt; اضغط&lt;strong&gt;إنشاء&lt;/strong&gt; . تمت إضافة هذا الملف الشخصي إلى منتقي ملف التعريف الخاص بك!&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;p&gt; إذا قمت بإنشاء ملف تعريف من قبل ولديك رقم تعريف شخصي:&lt;ol&gt;&lt;li&gt; من منتقي الملف الشخصي ، اضغط على&lt;strong&gt;إضافة الملف الشخصي&lt;/strong&gt;&lt;/li&gt; &lt;li&gt; أدخل رقم التعريف الشخصي الخاص بك وانقر فوق&lt;strong&gt;إرسال&lt;/strong&gt;&lt;/li&gt;&lt;li&gt; املأ جميع الحقول للملف الشخصي. &lt;ol&gt; &lt;li&gt;(اختياري) قم بتحميل صورة.&lt;/li&gt; &lt;li&gt;إدخال اسم.&lt;/li&gt; &lt;li&gt;(اختياري) قم بتعيين رقم تعريف شخصي مكون من 3 أرقام. &lt;/li&gt;&lt;/ol&gt;&lt;/li&gt;&lt;li&gt; اضغط&lt;strong&gt;إنشاء&lt;/strong&gt; . تمت إضافة هذا الملف الشخصي إلى منتقي ملف التعريف الخاص بك!&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;br&gt;&lt;p&gt; ملاحظة: فقط ال&lt;u&gt;مدير&lt;/u&gt; قادر على إدارة الملفات الشخصية.&lt;/p&gt;</string>
-  <string name="faq_answer_delete_profile">&lt;p&gt;بمجرد حذف ملف التعريف:&lt;/p&gt;&lt;ol&gt;&lt;li&gt;لا يمكن استعادة ملف التعريف.&lt;/li&gt;&lt;li&gt;سيتم حذف معلومات الملف الشخصي مثل الاسم والصور والتقدم بشكل دائم.&lt;/li&gt;&lt;/ol&gt;&lt;p&gt;لحذف ملف تعريف (باستثناء&lt;u&gt;المسؤول&lt;/u&gt;):&lt;/p&gt;&lt;ol&gt;&lt;li&gt; من الصفحة الرئيسية للمسؤول ، اضغط على زر القائمة أعلى اليسار.&lt;/li&gt;&lt;li&gt; اضغط على&lt;strong&gt;ضوابط المسؤول&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt; اضغط على&lt;strong&gt;تحرير ملفات التعريف&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt; اضغط على الملف الشخصي الذي ترغب في حذفه.&lt;/li&gt;&lt;li&gt; في الجزء السفلي من الشاشة ، انقر فوق&lt;strong&gt;حذف الملف الشخصي&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt; اضغط&lt;strong&gt;حذف&lt;/strong&gt;لتأكيد الحذف. &lt;/li&gt;&lt;/ol&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt; ملاحظة:&lt;u&gt;المسؤول&lt;/u&gt;فقط هو القادر على إدارة الملفات الشخصية.&lt;/p&gt;</string>
   <string name="faq_answer_whats_oppia">&lt;p&gt;%1$s &lt;i&gt;\"أو-بي-يا\"&lt;/i&gt;(فنلندية) - \"للتعلم\"&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;%1$sمهمتنا هي مساعدة أي شخص على تعلم أي شيء يريده بطريقة فعالة وممتعة.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;من خلال إنشاء مجموعة من الدروس المجانية عالية الجودة والفعالة بشكل واضح بمساعدة معلمين من جميع أنحاء العالم ، تهدف %1$s إلى تزويد الطلاب بتعليم جيد - بغض النظر عن مكان وجودهم أو الموارد التقليدية التي يمكنهم الوصول إليها.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;كطالب ، يمكنك أن تبدأ مغامرتك التعليمية من خلال تصفح الموضوعات المدرجة في الصفحة الرئيسية!&lt;/p&gt;</string>
-  <string name="faq_answer_whos_an_admin">&lt;p&gt;المشرف هو المستخدم الرئيسي الذي يدير ملفات التعريف والإعدادات لكل ملف تعريف على حسابه. هم على الأرجح والدك أو معلمك أو وصي عليك الذي أنشأ هذا الملف الشخصي لك.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;يمكن للمسؤولين إدارة الملفات الشخصية وتعيين أرقام التعريف الشخصية وتغيير الإعدادات الأخرى ضمن حساباتهم. بناءً على ملف التعريف الخاص بك ، قد تكون أذونات المسؤول مطلوبة لبعض الميزات مثل تنزيل الموضوعات وتغيير رقم التعريف الشخصي وغير ذلك.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;لمعرفة من هو المسؤول لديك ، انتقل إلى منتقي الملف الشخصي. الملف الشخصي الأول المدرج ولديه \"المسؤول\" مكتوب باسمه هو المسؤول.&lt;/p&gt;</string>
-  <string name="faq_answer_exploration_player">&lt;p&gt;إذا لم يتم تحميل مشغل الاستكشاف&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;تحقق لمعرفة ما إذا كان التطبيق محدثًا أم لا:&lt;/p&gt;&lt;p&gt; &lt;ul&gt; &lt;li&gt; انتقل إلى متجر Play وتأكد من تحديث التطبيق إلى أحدث إصدار &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;تحقق من اتصالك بالإنترنت:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; إذا كان اتصالك بالإنترنت بطيئًا ، فحاول إعادة الاتصال بشبكة Wi-Fi أو الاتصال بشبكة أخرى. &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;اطلب من المشرف التحقق من أجهزتهم واتصال الإنترنت:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; اطلب من المشرف استكشاف الأخطاء وإصلاحها باستخدام الخطوات المذكورة أعلاه &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;أخبرنا إذا كنت لا تزال تواجه مشكلات في التحميل:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; أبلغ عن مشكلة عن طريق الاتصال بنا على admin@oppia.org. &lt;/li&gt;&lt;/ul&gt;</string>
-  <string name="faq_answer_audio_not_playing">&lt;p&gt;إذا لم يتم تشغيل الصوت الخاص بك&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;تحقق لمعرفة ما إذا كان التطبيق محدثًا أم لا:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;انتقل إلى متجر Play وتأكد من تحديث التطبيق إلى أحدث إصدار&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;تحقق من اتصالك بالإنترنت:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;إذا كان اتصالك بالإنترنت بطيئًا ، فحاول إعادة الاتصال بشبكة Wi-Fi أو الاتصال بشبكة أخرى. قد يتسبب الإنترنت البطيء في تحميل الصوت بشكل غير منتظم ، مما يجعل من الصعب تشغيله.&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;اطلب من المسؤول التحقق من أجهزتهم واتصال الإنترنت:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;اطلب من المسؤول استكشاف الأخطاء وإصلاحها باستخدام الخطوات المذكورة أعلاه&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;أخبرنا إذا كنت لا تزال تواجه مشكلات في التحميل:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;أبلغ عن مشكلة عن طريق الاتصال بنا على admin@oppia.org.&lt;/li&gt;&lt;/ul&gt;</string>
+  <string name="faq_answer_whos_an_admin" fuzzy="true">&lt;p&gt;المشرف هو المستخدم الرئيسي الذي يدير ملفات التعريف والإعدادات لكل ملف تعريف على حسابه. هم على الأرجح والدك أو معلمك أو وصي عليك الذي أنشأ هذا الملف الشخصي لك.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;يمكن للمسؤولين إدارة الملفات الشخصية وتعيين أرقام التعريف الشخصية وتغيير الإعدادات الأخرى ضمن حساباتهم. بناءً على ملف التعريف الخاص بك ، قد تكون أذونات المسؤول مطلوبة لبعض الميزات مثل تنزيل الموضوعات وتغيير رقم التعريف الشخصي وغير ذلك.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;لمعرفة من هو المسؤول لديك ، انتقل إلى منتقي الملف الشخصي. الملف الشخصي الأول المدرج ولديه \"المسؤول\" مكتوب باسمه هو المسؤول.&lt;/p&gt;</string>
+  <string name="faq_answer_create_profile" fuzzy="true">&lt;p&gt;إذا كانت هذه هي المرة الأولى التي تنشئ فيها ملفًا شخصيًا وليس لديك رقم تعريف شخصي: &lt;ol&gt;&lt;li&gt; من منتقي الملف الشخصي ، اضغط على&lt;strong&gt; قم بإعداد ملفات تعريف متعددة&lt;/strong&gt;&lt;/li&gt;&lt;li&gt; قم بإنشاء رقم تعريف شخصي و&lt;strong&gt;احفظ&lt;/strong&gt;&lt;/li&gt;&lt;li&gt; املأ جميع البيانات للملف الشخصي.&lt;ol&gt;&lt;li&gt;(اختياري) قم بتحميل صورة.&lt;/li&gt; &lt;li&gt;إدخال اسم.&lt;/li&gt; &lt;li&gt;(اختياري) قم بتعيين رقم تعريف شخصي مكون من 3 أرقام.&lt;/li&gt;&lt;/ol&gt;&lt;/li&gt;&lt;li&gt; اضغط&lt;strong&gt;إنشاء&lt;/strong&gt; . تمت إضافة هذا الملف الشخصي إلى منتقي ملف التعريف الخاص بك!&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;p&gt; إذا قمت بإنشاء ملف تعريف من قبل ولديك رقم تعريف شخصي:&lt;ol&gt;&lt;li&gt; من منتقي الملف الشخصي ، اضغط على&lt;strong&gt;إضافة الملف الشخصي&lt;/strong&gt;&lt;/li&gt; &lt;li&gt; أدخل رقم التعريف الشخصي الخاص بك وانقر فوق&lt;strong&gt;إرسال&lt;/strong&gt;&lt;/li&gt;&lt;li&gt; املأ جميع الحقول للملف الشخصي. &lt;ol&gt; &lt;li&gt;(اختياري) قم بتحميل صورة.&lt;/li&gt; &lt;li&gt;إدخال اسم.&lt;/li&gt; &lt;li&gt;(اختياري) قم بتعيين رقم تعريف شخصي مكون من 3 أرقام. &lt;/li&gt;&lt;/ol&gt;&lt;/li&gt;&lt;li&gt; اضغط&lt;strong&gt;إنشاء&lt;/strong&gt; . تمت إضافة هذا الملف الشخصي إلى منتقي ملف التعريف الخاص بك!&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;br&gt;&lt;p&gt; ملاحظة: فقط ال&lt;u&gt;مدير&lt;/u&gt; قادر على إدارة الملفات الشخصية.&lt;/p&gt;</string>
+  <string name="faq_answer_app_language">&lt;p&gt;التطبيق %s يدعم حاليا اللغة الإنجليزية والبرتغالية البرازيلية والعربية والسواحيلية والبيدجينية النيجيرية. اختر إحدى هذه اللغات من القائمة، في الخيارات. لطلب التطبيق باللغة التي تتحدث بها، يرجى الاتصال بنا على   &lt;strong&gt;admin@oppia.org&lt;/strong&gt;.&lt;/p&gt;</string>
+  <string name="faq_answer_bug_reporting">&lt;p&gt;&lt;ol&gt;&lt;li&gt;من خلال %s شاشة التطبيق الرئيسية، اضغط على القائمة في أعلى الزاوية اليسرى&lt;/li&gt;&lt;li&gt;اضغط على &lt;strong&gt;مشاركة التعليقات&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;اتبع التعليمات للإبلاغ عن الأخطاء أو مشاركة التعليقات&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;</string>
+  <string name="faq_answer_math_lessons">&lt;p&gt;%1$s مهمتها مساعدة المتعلمين على اكتساب المهارات الحياتية اللازمة. الرياضيات مهارة أساسية في الحياة اليومية1%$s سوف تقدم دروسا جديدة في العلوم وغيرها من المواد قريبا!&lt;/p&gt;</string>
+  <string name="faq_answer_more_lessons">&lt;p&gt;أجل, %s سوف تقدم دروسا جديدة في العلوم وفي مواد أخرى قريبا. الرجاء زيارتنا مجددا لمعرفة كل ماهو جديد!&lt;/p&gt;</string>
+  <string name="faq_answer_exploration_player" fuzzy="true">&lt;p&gt;إذا لم يتم تحميل مشغل الاستكشاف&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;تحقق لمعرفة ما إذا كان التطبيق محدثًا أم لا:&lt;/p&gt;&lt;p&gt; &lt;ul&gt; &lt;li&gt; انتقل إلى متجر Play وتأكد من تحديث التطبيق إلى أحدث إصدار &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;تحقق من اتصالك بالإنترنت:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; إذا كان اتصالك بالإنترنت بطيئًا ، فحاول إعادة الاتصال بشبكة Wi-Fi أو الاتصال بشبكة أخرى. &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;اطلب من المشرف التحقق من أجهزتهم واتصال الإنترنت:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; اطلب من المشرف استكشاف الأخطاء وإصلاحها باستخدام الخطوات المذكورة أعلاه &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;أخبرنا إذا كنت لا تزال تواجه مشكلات في التحميل:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; أبلغ عن مشكلة عن طريق الاتصال بنا على admin@oppia.org. &lt;/li&gt;&lt;/ul&gt;</string>
+  <string name="faq_answer_audio_not_playing" fuzzy="true">&lt;p&gt;إذا لم يتم تشغيل الصوت الخاص بك&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;تحقق لمعرفة ما إذا كان التطبيق محدثًا أم لا:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;انتقل إلى متجر Play وتأكد من تحديث التطبيق إلى أحدث إصدار&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;تحقق من اتصالك بالإنترنت:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;إذا كان اتصالك بالإنترنت بطيئًا ، فحاول إعادة الاتصال بشبكة Wi-Fi أو الاتصال بشبكة أخرى. قد يتسبب الإنترنت البطيء في تحميل الصوت بشكل غير منتظم ، مما يجعل من الصعب تشغيله.&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;اطلب من المسؤول التحقق من أجهزتهم واتصال الإنترنت:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;اطلب من المسؤول استكشاف الأخطاء وإصلاحها باستخدام الخطوات المذكورة أعلاه&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;أخبرنا إذا كنت لا تزال تواجه مشكلات في التحميل:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;أبلغ عن مشكلة عن طريق الاتصال بنا على admin@oppia.org.&lt;/li&gt;&lt;/ul&gt;</string>
+  <string name="faq_answer_delete_profile" fuzzy="true">&lt;p&gt;بمجرد حذف ملف التعريف:&lt;/p&gt;&lt;ol&gt;&lt;li&gt;لا يمكن استعادة ملف التعريف.&lt;/li&gt;&lt;li&gt;سيتم حذف معلومات الملف الشخصي مثل الاسم والصور والتقدم بشكل دائم.&lt;/li&gt;&lt;/ol&gt;&lt;p&gt;لحذف ملف تعريف (باستثناء&lt;u&gt;المسؤول&lt;/u&gt;):&lt;/p&gt;&lt;ol&gt;&lt;li&gt; من الصفحة الرئيسية للمسؤول ، اضغط على زر القائمة أعلى اليسار.&lt;/li&gt;&lt;li&gt; اضغط على&lt;strong&gt;ضوابط المسؤول&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt; اضغط على&lt;strong&gt;تحرير ملفات التعريف&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt; اضغط على الملف الشخصي الذي ترغب في حذفه.&lt;/li&gt;&lt;li&gt; في الجزء السفلي من الشاشة ، انقر فوق&lt;strong&gt;حذف الملف الشخصي&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt; اضغط&lt;strong&gt;حذف&lt;/strong&gt;لتأكيد الحذف. &lt;/li&gt;&lt;/ol&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt; ملاحظة:&lt;u&gt;المسؤول&lt;/u&gt;فقط هو القادر على إدارة الملفات الشخصية.&lt;/p&gt;</string>
+  <string name="faq_answer_update_app">&lt;p&gt;&lt;ol&gt;&lt;li&gt;افتح تطبيق Google Play Store&lt;/li&gt;&lt;li&gt;ابحث عن %s التطبيق&lt;/li&gt;&lt;li&gt;اضغط على تحديث&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;</string>
+  <string name="faq_answer_update_os">&lt;p&gt;&lt;ol&gt;&lt;li&gt;اضغط على تطبيق الإعدادات في هاتفك&lt;/li&gt;&lt;li&gt;اضغط على تحديثات النظام&lt;/li&gt;&lt;li&gt;اضغط على تحديثات النظام واتبع التعليمات لتحديث نظام تشغيل Android الخاص بك&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;</string>
   <string name="faq_answer_cant_find_question">&lt;p&gt; إذا لم تتمكن من العثور على سؤالك أو كنت ترغب في الإبلاغ عن خطأ ، فاتصل بنا على admin@oppia.org. &lt;/p&gt;</string>
   <string name="profile_edit_fragment_test_activity_label">نشاط اختبار جزء تحرير ملف التعريف</string>
   <string name="administrator_controls_fragment_test_activity_label">يتحكم المسؤول في نشاط اختبار التجزئة</string>
diff --git a/app/src/main/res/values-pcm-rNG/strings.xml b/app/src/main/res/values-pcm-rNG/strings.xml
index 5e98c6d7d17..36fdceba18c 100644
--- a/app/src/main/res/values-pcm-rNG/strings.xml
+++ b/app/src/main/res/values-pcm-rNG/strings.xml
@@ -463,11 +463,11 @@
   <string name="beta_notice_dialog_title">Beta Notice</string>
   <string name="beta_notice_dialog_message">Hello! Your app don dey update to di Beta version. If you experience any problems while you dey use di app, or get any questions, abeg contact us at android-feedback@oppia.org.</string>
   <string name="beta_notice_dialog_do_not_show_again_text">No show dis message again</string>
-  <string name="beta_notice_dialog_close_button_text">OK</string>
+  <string name="beta_notice_dialog_close_button_text" fuzzy="true">OK</string>
   <string name="general_availability_notice_dialog_title">General Availability Notice</string>
   <string name="general_availability_notice_dialog_message">Hello! Your app don dey update to di General Availability version. If you experience any problems while you dey use di app, or get any questions, abeg contact us at android-feedback@oppia.org.</string>
   <string name="general_availability_notice_dialog_do_not_show_again_text">No show dis message again</string>
-  <string name="general_availability_notice_dialog_close_button_text">OK</string>
+  <string name="general_availability_notice_dialog_close_button_text" fuzzy="true">OK</string>
   <string name="ratio_content_description_separator">to</string>
   <string name="ratio_default_hint_text">Enter a ratio in di form x:y.</string>
   <string name="text_input_default_hint_text">Tap here to put text.</string>
@@ -514,24 +514,19 @@
   <string name="faq_question_bug_reporting" fuzzy="true">I see bug for di app. How I fit report am?</string>
   <string name="faq_question_math_lessons" fuzzy="true">Why only math lessons dey available?</string>
   <string name="faq_question_more_lessons" fuzzy="true">Una go dey create more lessons?</string>
-  <string name="faq_question_exploration_player" >Why di Exploration player no dey load?</string>
+  <string name="faq_question_exploration_player">Why di Exploration player no dey load?</string>
   <string name="faq_question_audio_not_playing">Why my audio no dey play?</string>
   <string name="faq_question_delete_profile">How I go delete a profile?</string>
   <string name="faq_question_update_app" fuzzy="true">How I fit update di app?</string>
   <string name="faq_question_update_os" fuzzy="true">How I fit update my Android OS?</string>
   <string name="faq_question_cant_find_question">I no dey find my question here. What now?</string>
   <string name="faq_answer_whats_oppia">&lt;p&gt;%1$s &lt;i&gt;\"O-pee-yah\"&lt;/i&gt; (Finnish) - \"to learn\"&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;%1$s\'s mission na to help anyone learn anything dey want in an effective and enjoyable way.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;By creating a set of free, high-quality, demonstrably effective lessons with di help of educators from around di world, %1$s dey aim to provide students with quality education — regardless of where dem dey or di traditional resources wey dem get access to.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;As a student, you fit start your learning adventure by browsing di topics listed on di Home Page!&lt;/p&gt;</string>
-  <string name="faq_answer_whos_an_admin">&lt;p&gt;An Administrator na di main user wey dey manage profiles and settings for every profile on top their account. They fit be your parent, teacher, or guardian wey don create dis profile for you. &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Administrators get di ability to manage profiles, assign PINs, and change other settings under their account. Depending on your profile, Administrator permissions fit dey required for some features such as changing your PIN, and more. &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;To see who your Administrator be, go di Profile Chooser. Di first profile fot di list and get \"Administrator\" written under their name na di Administrator. &lt;/p&gt;</string>
-  <string name="faq_answer_create_profile">&lt;p&gt;If na your first time creating a profile and not have a PIN:&lt;ol&gt;&lt;li&gt;From di Profile Chooser, tap on &lt;strong&gt;Set up Multiple Profiles&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;Create a PIN and &lt;strong&gt;Save&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;Fill in all boxes for di profile.&lt;ol&gt;&lt;li&gt;(Optional) Upload a photo.&lt;/li&gt;&lt;li&gt;Enter a name.&lt;/li&gt;&lt;li&gt;(Optional) Assign a 3-digit PIN.&lt;/li&gt;&lt;/ol&gt;&lt;/li&gt;&lt;li&gt;Tap &lt;strong&gt;Create&lt;/strong&gt;. Dis profile go add to your Profile Chooser!&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;p&gt; If you don create a profile before and you get a PIN:&lt;ol&gt;&lt;li&gt;From di Profile Chooser, tap on &lt;strong&gt;Add Profile&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Enter your PIN and tap &lt;strong&gt;Submit&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Fill in all boxes for di profile.&lt;ol&gt;&lt;li&gt; (Optional) Upload a photo. &lt;/li&gt;&lt;li&gt; Enter a name. &lt;/li&gt;&lt;li&gt; (Optional) Assign a 3-digit PIN. &lt;/li&gt;&lt;/ol&gt;&lt;/li&gt;&lt;li&gt;Tap &lt;strong&gt;Create&lt;/strong&gt;. Dis profile go add to your Profile Chooser!&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;br&gt;&lt;p&gt;Note: Only di &lt;u&gt;Administrator&lt;/u&gt; go dey able to manage profiles.&lt;/p&gt;</string>
-  <string name="faq_answer_app_language" fuzzy="true">&lt;p&gt;The %s app dey support English, Brazilian Portuguese, Arabic, Swahili, and Nigerian Pidgin. Select one of these languages for di menu, under Options. To ask for the app for your language, abeg contact us for <strong>admin@oppia.org</strong>.&lt;/p&gt;</string>
-  <string name="faq_answer_bug_reporting" fuzzy="true">&lt;p&gt;<ol><li>From your %s app home screen, tap the menu for di top left corner.</li><li>Tap <strong>Share feedback</strong>.</li><li>Follow di instructions to report di bug or share feedback.</li></ol>&lt;/p&gt;</string>
-  <string name="faq_answer_math_lessons" fuzzy="true"><p>%1$s mission na to help learners gain necessary life skills. Math na essential skill for everyday life. %1$s go dey offer new lessons on science and other subjects very soon!</p></string>
-  <string name="faq_answer_more_lessons" fuzzy="true"><p>Yes, %s go dey offer new lessons on science and other subjects very soon. Abeg check back for updates!</p></string>
-  <string name="faq_answer_exploration_player">&lt;p&gt;If di Exploration Player no dey load&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Check to see if di app dey up to date:&lt;/p&gt;&lt;p&gt;&lt;ul&gt;&lt;li&gt; Go to di Play Store and make sure sey di app dey updated to di latest version &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Check your internet connection:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; If your internet connection dey slow, try re-connecting to your Wi-Fi network or connecting to a different network. &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Ask di Administrator to check their device and internet connection:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Get di Administrator to troubleshoot using di steps above &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Let us know if you still dey get issues with loading:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Report a problem by contacting us at admin@oppia.org. &lt;/li&gt;&lt;/ul&gt;</string>
-  <string name="faq_answer_audio_not_playing">&lt;p&gt;If your audio no dey play&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Check to see if di app dey up to date:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Go to di Play Store and make sure sey di app dey updated to di latest version &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Check your internet connection:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; If your internet connection dey slow, try re-connecting to your Wi-Fi network or connecting to a different network. Slow internet fit cause di audio to load irregularly, and go make am difficult to play. &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Ask di Administrator to check their device and internet connection:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Get di Administrator to troubleshoot using di steps for up&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Let us know if you still dey get issues with loading:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Report a problem by contacting us at admin@oppia.org. &lt;/li&gt;&lt;/ul&gt;</string>
-  <string name="faq_answer_delete_profile">&lt;p&gt;Once profile don delete:&lt;/p&gt;&lt;ol&gt;&lt;li&gt;Di profile no fit dey recovered. &lt;/li&gt;&lt;li&gt; Profile information such as name, photos, and progress go permanently delete. &lt;/li&gt;&lt;/ol&gt;&lt;p&gt;To delete a profile (excluding the &lt;u&gt;Administrator\'s&lt;/u&gt;):&lt;/p&gt;&lt;ol&gt;&lt;li&gt; From di Administrator\'s Home Page, tap on di menu button on di top left. &lt;/li&gt;&lt;li&gt;Tap on &lt;strong&gt;Administrator Controls&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Tap on &lt;strong&gt;Edit Profiles&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Tap on di Profile wey you wan delete. &lt;/li&gt;&lt;li&gt;For di bottom of di screen, tap &lt;strong&gt;Profile Deletion&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Tap &lt;strong&gt;Delete&lt;/strong&gt; to confirm deletion. &lt;/li&gt;&lt;/ol&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Note: Only di &lt;u&gt;Administrator&lt;/u&gt; go dey able to manage profiles.&lt;/p&gt;</string>
-  <string name="faq_answer_update_app" fuzzy="true"><p><ol><li>Open di Google Play Store app.</li><li>Search for di %s app.</li><li>Tap Update.</li></ol></p></string>
-  <string name="faq_answer_update_os" fuzzy="true"><ol><li>Tap your phone\'s Settings app.</li><li>Tap System updates.</li><li>Tap System updates and follow di instructions to update your Android operating system.</li></ol></string>
+  <string name="faq_answer_whos_an_admin" fuzzy="true">&lt;p&gt;An Administrator na di main user wey dey manage profiles and settings for every profile on top their account. They fit be your parent, teacher, or guardian wey don create dis profile for you. &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Administrators get di ability to manage profiles, assign PINs, and change other settings under their account. Depending on your profile, Administrator permissions fit dey required for some features such as changing your PIN, and more. &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;To see who your Administrator be, go di Profile Chooser. Di first profile fot di list and get \"Administrator\" written under their name na di Administrator. &lt;/p&gt;</string>
+  <string name="faq_answer_create_profile" fuzzy="true">&lt;p&gt;If na your first time creating a profile and not have a PIN:&lt;ol&gt;&lt;li&gt;From di Profile Chooser, tap on &lt;strong&gt;Set up Multiple Profiles&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;Create a PIN and &lt;strong&gt;Save&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;Fill in all boxes for di profile.&lt;ol&gt;&lt;li&gt;(Optional) Upload a photo.&lt;/li&gt;&lt;li&gt;Enter a name.&lt;/li&gt;&lt;li&gt;(Optional) Assign a 3-digit PIN.&lt;/li&gt;&lt;/ol&gt;&lt;/li&gt;&lt;li&gt;Tap &lt;strong&gt;Create&lt;/strong&gt;. Dis profile go add to your Profile Chooser!&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;p&gt; If you don create a profile before and you get a PIN:&lt;ol&gt;&lt;li&gt;From di Profile Chooser, tap on &lt;strong&gt;Add Profile&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Enter your PIN and tap &lt;strong&gt;Submit&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Fill in all boxes for di profile.&lt;ol&gt;&lt;li&gt; (Optional) Upload a photo. &lt;/li&gt;&lt;li&gt; Enter a name. &lt;/li&gt;&lt;li&gt; (Optional) Assign a 3-digit PIN. &lt;/li&gt;&lt;/ol&gt;&lt;/li&gt;&lt;li&gt;Tap &lt;strong&gt;Create&lt;/strong&gt;. Dis profile go add to your Profile Chooser!&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;br&gt;&lt;p&gt;Note: Only di &lt;u&gt;Administrator&lt;/u&gt; go dey able to manage profiles.&lt;/p&gt;</string>
+  <string name="faq_answer_app_language" fuzzy="true">&lt;p&gt;The %s app dey support English, Brazilian Portuguese, Arabic, Swahili, and Nigerian Pidgin. Select one of these languages for di menu, under Options. To ask for the app for your language, abeg contact us for .&lt;/p&gt;</string>
+  <string name="faq_answer_exploration_player" fuzzy="true">&lt;p&gt;If di Exploration Player no dey load&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Check to see if di app dey up to date:&lt;/p&gt;&lt;p&gt;&lt;ul&gt;&lt;li&gt; Go to di Play Store and make sure sey di app dey updated to di latest version &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Check your internet connection:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; If your internet connection dey slow, try re-connecting to your Wi-Fi network or connecting to a different network. &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Ask di Administrator to check their device and internet connection:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Get di Administrator to troubleshoot using di steps above &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Let us know if you still dey get issues with loading:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Report a problem by contacting us at admin@oppia.org. &lt;/li&gt;&lt;/ul&gt;</string>
+  <string name="faq_answer_audio_not_playing" fuzzy="true">&lt;p&gt;If your audio no dey play&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Check to see if di app dey up to date:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Go to di Play Store and make sure sey di app dey updated to di latest version &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Check your internet connection:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; If your internet connection dey slow, try re-connecting to your Wi-Fi network or connecting to a different network. Slow internet fit cause di audio to load irregularly, and go make am difficult to play. &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Ask di Administrator to check their device and internet connection:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Get di Administrator to troubleshoot using di steps for up&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Let us know if you still dey get issues with loading:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Report a problem by contacting us at admin@oppia.org. &lt;/li&gt;&lt;/ul&gt;</string>
+  <string name="faq_answer_delete_profile" fuzzy="true">&lt;p&gt;Once profile don delete:&lt;/p&gt;&lt;ol&gt;&lt;li&gt;Di profile no fit dey recovered. &lt;/li&gt;&lt;li&gt; Profile information such as name, photos, and progress go permanently delete. &lt;/li&gt;&lt;/ol&gt;&lt;p&gt;To delete a profile (excluding the &lt;u&gt;Administrator\'s&lt;/u&gt;):&lt;/p&gt;&lt;ol&gt;&lt;li&gt; From di Administrator\'s Home Page, tap on di menu button on di top left. &lt;/li&gt;&lt;li&gt;Tap on &lt;strong&gt;Administrator Controls&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Tap on &lt;strong&gt;Edit Profiles&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Tap on di Profile wey you wan delete. &lt;/li&gt;&lt;li&gt;For di bottom of di screen, tap &lt;strong&gt;Profile Deletion&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Tap &lt;strong&gt;Delete&lt;/strong&gt; to confirm deletion. &lt;/li&gt;&lt;/ol&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Note: Only di &lt;u&gt;Administrator&lt;/u&gt; go dey able to manage profiles.&lt;/p&gt;</string>
   <string name="faq_answer_cant_find_question">&lt;p&gt;If you no fit find your question or you go like to report a bug, contact us for admin@oppia.org.&lt;/p&gt;</string>
   <string name="profile_edit_fragment_test_activity_label">Profile Edit Fragment Test Activity</string>
   <string name="administrator_controls_fragment_test_activity_label">Administrator Controls Fragment Test Activity</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 9711a238ba1..a514d6dc65e 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Authors:
+* Andrekowacs
 * Carolintaschi
+* Debora Gadelha
 * Eduardoaddad
 * Felipe L. Ewald
 * Jfalarini
 * Leosls
+* Pyscowicz
 * Re demz
 * Seanlip
 * Svjatysberega
+* Vanessagelinski
 * YuriNikolai
 -->
 <resources>
@@ -16,6 +20,7 @@
   <string name="menu_my_downloads">Meus Downloads</string>
   <string name="menu_help">Ajuda</string>
   <string name="exploration_activity_title">Reprodutor de Exploração</string>
+  <string name="play_exploration_button_text">Explorar</string>
   <string name="help_activity_title">Ajuda</string>
   <string name="bottom_sheet_options_menu_close">Fechar</string>
   <string name="menu_switch_profile">Trocar Perfil</string>
@@ -26,18 +31,20 @@
   <string name="audio_play_description">Tocar áudio</string>
   <string name="audio_pause_description">Pausar áudio</string>
   <string name="audio_unavailable_in_selected_language">%s o áudio não está disponível.</string>
-  <string name="audio_language_select_dialog_okay_button" fuzzy="true">OK</string>
+  <string name="audio_language_select_dialog_okay_button">Ok</string>
   <string name="audio_language_select_dialog_cancel_button">Cancelar</string>
   <string name="audio_language_select_dialog_title">Idioma de Áudio</string>
   <string name="audio_dialog_offline_title">Atualmente Offline</string>
   <string name="audio_dialog_offline_message">Certifique-se de que o Wi-Fi ou os dados móveis estejam ativados e tente novamente.</string>
-  <string name="audio_dialog_offline_positive" fuzzy="true">OK</string>
-  <string name="cellular_data_alert_dialog_okay_button" fuzzy="true">OK</string>
+  <string name="audio_dialog_offline_positive">Ok</string>
+  <string name="cellular_data_alert_dialog_okay_button">Ok</string>
   <string name="cellular_data_alert_dialog_cancel_button">Cancelar</string>
   <string name="cellular_data_alert_dialog_title">Atualmente em Dados Móveis</string>
   <string name="cellular_data_alert_dialog_description">O streaming de áudio pode usar muitos dados móveis.</string>
   <string name="cellular_data_alert_dialog_checkbox">Não mostre esta mensagem novamente</string>
   <string name="concept_card_toolbar_title">Cartão de Conceito</string>
+  <string name="concept_card_one_button_text">Cartão Conceitual 1</string>
+  <string name="concept_card_two_button_text">Cartão Conceitual 2</string>
   <string name="revision_card_toolbar_title">Cartão de Revisão</string>
   <string name="unsaved_exploration_dialog_title">Pretende ir para a página do tópico?</string>
   <string name="unsaved_exploration_dialog_description">Seu progresso não será salvo.</string>
@@ -71,13 +78,16 @@
   <string name="previous_state_description">Voltar ao cartão anterior</string>
   <string name="next_state_description">Avançar para o próximo cartão</string>
   <string name="state_submit_button">Enviar</string>
+  <string name="submit_button_text">Enviar</string>
   <string name="lesson_replay_button_text">Repetir</string>
   <string name="state_end_exploration_button">Retornar ao Tópico</string>
   <string name="previous_responses_header">Respostas Anteriores (%s)</string>
   <string name="image_interaction_answer_text">Cliques em %s</string>
+  <string name="image_error_empty_input">Selecione uma imagem para continuar.</string>
   <string name="state_learn_again_button">Aprender Novamente</string>
   <string name="see_more">Veja Mais</string>
   <string name="see_less">Veja Menos</string>
+  <string name="sample_text_view_text">Esta é uma visualização de texto de exemplo</string>
   <string name="FAQs">FAQs</string>
   <string name="featured_questions">Perguntas em Destaque</string>
   <string name="frequently_asked_questions">Perguntas Frequentes</string>
@@ -106,8 +116,11 @@
   <string name="numeric_input_hint">Digite um número.</string>
   <string name="number_with_units_input_hint_text">Escreva números com unidades aqui.</string>
   <string name="numeric_expression_default_hint_text">Digite uma expressão aqui, usando apenas números.</string>
+  <string name="numeric_expression_error_empty_input">Insira uma expressão numérica para continuar.</string>
   <string name="algebraic_expression_default_hint_text">Digite uma expressão aqui.</string>
+  <string name="algebraic_expression_error_empty_input">Insira uma expressão algébrica para continuar.</string>
   <string name="math_equation_default_hint_text">Digite uma equação aqui.</string>
+  <string name="math_equation_error_empty_input">Insira uma equação para continuar.</string>
   <string name="math_expression_error_spaces_in_numerical_input">Por favor, remova os espaços entre os números em sua resposta.</string>
   <string name="math_expression_error_unbalanced_parentheses">Feche ou remova os parênteses.</string>
   <string name="math_expression_error_single_redundant_parentheses">Por favor, remova os parênteses ao redor da resposta inteira: \'%s\'.</string>
@@ -169,14 +182,19 @@
   <string name="fraction_error_invalid_format">Insira uma fração válida (por exemplo, 5/3 ou 1 2/3)</string>
   <string name="fraction_error_divide_by_zero">Por favor, não coloque 0 no denominador</string>
   <string name="fraction_error_larger_than_seven_digits">Nenhum dos números da fração deve ter mais de 7 dígitos.</string>
+  <string name="fraction_error_empty_input">Insira uma fração para continuar.</string>
   <string name="number_error_starting_with_floating_point">Comece sua resposta com um número (por exemplo, \"0\" em 0,5)</string>
   <string name="number_error_invalid_format">Por favor, insira um número válido.</string>
   <string name="number_error_larger_than_fifteen_characters">A resposta pode conter no máximo 15 dígitos (0–9) ou símbolos (. ou -).</string>
-  <string name="ratio_error_invalid_chars" fuzzy="true">Escreva uma proporção que consista em dígitos separados por dois pontos (por exemplo, 1:2 ou 1:2:3).</string>
-  <string name="ratio_error_invalid_format" fuzzy="true">Insira uma proporção válida (por exemplo, 1:2 ou 1:2:3).</string>
-  <string name="ratio_error_invalid_colons" fuzzy="true">Sua resposta tem dois dois-pontos (:) do lado um do outro.</string>
-  <string name="ratio_error_invalid_size" fuzzy="true">O número de termos não é igual ao exigido.</string>
-  <string name="ratio_error_includes_zero" fuzzy="true">Proporções não podem ter 0 como elemento.</string>
+  <string name="number_error_empty_input">Digite um número para continuar.</string>
+  <string name="ratio_error_invalid_chars">Escreva uma proporção que consista em dígitos separados por dois pontos (por exemplo, 1:2 ou 1:2:3).</string>
+  <string name="ratio_error_invalid_format">Insira uma proporção válida (por exemplo, 1:2 ou 1:2:3).</string>
+  <string name="ratio_error_invalid_colons">Sua resposta tem dois pontos (:) próximos um do outro.</string>
+  <string name="ratio_error_invalid_size">O número de termos não é igual aos termos exigidos.</string>
+  <string name="ratio_error_includes_zero">As proporções não podem ter 0 como elemento.</string>
+  <string name="ratio_error_empty_input">Insira uma proporção para continuar.</string>
+  <string name="text_error_empty_input">Digite o texto para continuar.</string>
+  <string name="selection_error_empty_input">Escolha uma resposta para continuar.</string>
   <string name="unknown_size">Tamanho desconhecido</string>
   <string name="size_bytes">%s Bytes</string>
   <string name="size_kb">%s KB</string>
@@ -307,6 +325,8 @@
   <string name="home_activity_title">Início</string>
   <string name="promoted_story_spotlight_hint">A partir de agora, você pode ver as lições recomendadas para você aqui.</string>
   <string name="select_a_topic_to_start">Selecione um Tópico para começar</string>
+  <string name="classroom_list_activity_title">Início</string>
+  <string name="classrooms_list_activity_section_header">Salas de aula</string>
   <string name="profile_list_activity_title">Perfis</string>
   <string name="profile_edit_activity_title">Editar Perfil</string>
   <string name="profile_edit_created">Criado em %s</string>
@@ -330,7 +350,7 @@
   <string name="profile_picture_edit_alert_dialog_choose_from_library">Escolha da Biblioteca</string>
   <string name="profile_rename_activity_title">Renomear Perfil</string>
   <string name="profile_rename_label">Novo Nome</string>
-  <string name="profile_rename_save" fuzzy="true">salvar</string>
+  <string name="profile_rename_save">Salvar</string>
   <string name="profile_reset_pin_activity_title">Redefinir PIN</string>
   <string name="profile_reset_pin_main">Insira um novo PIN para o usuário usar ao acessar seu perfil.</string>
   <string name="profile_reset_pin_user_pin_label">PIN de 3 Dígitos</string>
@@ -343,6 +363,7 @@
   <string name="add_profile_required">Requerido</string>
   <string name="back_button">Botão de Voltar</string>
   <string name="next">Próximo</string>
+  <string name="learner_analytics_label_text">Análise de estudo do aluno</string>
   <string name="administrator_controls_general_label">Geral</string>
   <string name="administrator_controls_edit_account">Editar conta</string>
   <string name="administrator_controls_profile_management_label">Gerenciamento de Perfil</string>
@@ -363,12 +384,12 @@
   <string name="app_last_update_date">A última atualização foi instalada em %s. Use o número da versão acima para enviar feedback sobre erros.</string>
   <string name="app_version_activity_title">Versão do Aplicativo</string>
   <string name="app_language_activity_title">Idioma do Aplicativo</string>
-  <string name="audio_language_activity_title" fuzzy="true">Idioma Padrão de Áudio</string>
+  <string name="audio_language_activity_title">Idioma de áudio preferido</string>
   <string name="reading_text_size_activity_title">Tamanho do Texto de Leitura</string>
   <string name="title_reading_text_size">Tamanho do Texto de Leitura</string>
   <string name="story_text_will_look_like_this">O texto da história ficará assim.</string>
   <string name="constant_string_for_text_size">A</string>
-  <string name="audio_language" fuzzy="true">Áudio Padrão</string>
+  <string name="audio_language">Idioma de áudio preferido</string>
   <string name="app_language">Idioma do Aplicativo</string>
   <string name="reading_text_size">Tamanho do Texto de Leitura</string>
   <string name="reading_text_size_small">Pequeno</string>
@@ -391,7 +412,7 @@
   <string name="great">Ótimo</string>
   <string name="lets_get_started">Vamos começar.</string>
   <string name="yes">Sim</string>
-  <string name="no">Não&#8230;</string>
+  <string name="no">Não…</string>
   <string name="pick_a_different_topic">Escolha um\ntópico diferente.</string>
   <string name="are_you_interested">Você está interessado em:\n%s?</string>
   <string name="new_hint_available">Nova dica disponível</string>
@@ -417,6 +438,7 @@
   <string name="return_to_lesson">Voltar para a lição</string>
   <string name="explanation">Explicação:</string>
   <string name="drag_and_drop_interaction_group_merge_hint">Se dois itens forem iguais, junte-os.</string>
+  <string name="drag_and_drop_interaction_empty_input">Organize as caixas para continuar.</string>
   <string name="link_to_item_below">Link para o item %s</string>
   <string name="unlink_items">Desvincular itens em %s</string>
   <string name="move_item_down_content_description">Mover o item para baixo para %s</string>
@@ -427,9 +449,20 @@
   <string name="topic_revision_recyclerview_tag">topic_revision_recyclerview_tag</string>
   <string name="ongoing_recycler_view_tag">ongoing_recycler_view_tag</string>
   <string name="item_selection_text">Por favor, selecione todas as alternativas corretas.</string>
-  <string name="unsupported_app_version_dialog_title" fuzzy="true">Versão do aplicativo não suportada</string>
+  <string name="unsupported_app_version_dialog_title">Versão do aplicativo não suportada</string>
   <string name="unsupported_app_version_dialog_message">Esta versão do aplicativo não é mais suportada. Atualize-a na Play Store.</string>
   <string name="unsupported_app_version_dialog_close_button_text">Fechar aplicativo</string>
+  <string name="forced_app_update_dialog_title">Atualização do aplicativo necessária</string>
+  <string name="forced_app_update_dialog_message">Uma nova versão de %s já está disponível. A nova versão é mais segura e melhora sua experiência de aprendizado.\n\nEsta versão não é mais suportada. Para continuar usando o aplicativo, atualize para a versão mais recente.</string>
+  <string name="forced_app_update_dialog_update_button_text">Atualizar</string>
+  <string name="forced_app_update_dialog_close_button_text">Fechar App</string>
+  <string name="optional_app_update_dialog_title">Nova atualização disponível</string>
+  <string name="optional_app_update_dialog_message">Uma nova versão de %s já está disponível. Recomendamos que você atualize o aplicativo para corrigir bugs e melhorar a experiência de aprendizado.</string>
+  <string name="optional_app_update_dialog_dismiss_button_text">Dispensar</string>
+  <string name="optional_app_update_dialog_update_button_text">Atualizar</string>
+  <string name="os_deprecation_dialog_title">Atualize seu sistema operacional Android</string>
+  <string name="os_deprecation_dialog_message">Recomendamos atualizar seu sistema operacional Android para aproveitar os novos recursos e lições do %s.\n\nVisite o aplicativo Configurações do seu telefone para atualizar seu sistema operacional.</string>
+  <string name="os_deprecation_dialog_dismiss_button_text">Dispensar</string>
   <string name="splash_screen_developer_label">Versão do desenvolvedor</string>
   <string name="splash_screen_alpha_label">Alfa</string>
   <string name="splash_screen_beta_label">Beta</string>
@@ -441,9 +474,11 @@
   <string name="general_availability_notice_dialog_message">Olá! Seu aplicativo está sendo atualizado para a versão de disponibilidade geral. Se você tiver problemas ao usar o aplicativo ou tiver dúvidas, entre em contato conosco em android-feedback@oppia.org.</string>
   <string name="general_availability_notice_dialog_do_not_show_again_text">Não exibir esta mensagem novamente</string>
   <string name="general_availability_notice_dialog_close_button_text">OK</string>
-  <string name="ratio_content_description_separator" fuzzy="true"> para</string>
-  <string name="ratio_default_hint_text" fuzzy="true">Insira uma razão no formato x:y.</string>
+  <string name="ratio_content_description_separator"> para</string>
+  <string name="ratio_default_hint_text">Insira uma proporção no formato x:y.</string>
   <string name="text_input_default_hint_text">Clique aqui para inserir texto.</string>
+  <string name="test_number_input_interaction_hint">Escreva o dígito aqui.</string>
+  <string name="test_text_input_interaction_hint">Escreva aqui.</string>
   <string name="smallest_text_size_content_description">Menor tamanho de texto</string>
   <string name="largest_text_size_content_description">Maior tamanho de texto</string>
   <string name="coming_soon">Em Breve</string>
@@ -481,16 +516,28 @@
   <string name="faq_question_whats_oppia">O que é %s?</string>
   <string name="faq_question_whos_an_admin">Quem é um administrador?</string>
   <string name="faq_question_create_profile">Como posso criar um novo perfil?</string>
+  <string name="faq_question_app_language">Como faço para obter o aplicativo no meu idioma?</string>
+  <string name="faq_question_bug_reporting">Achei um bug. Como posso reportar?</string>
+  <string name="faq_question_math_lessons">Por que só há aulas de matemática?</string>
+  <string name="faq_question_more_lessons">Vocês vão criar mais lições?</string>
   <string name="faq_question_exploration_player">Por que a exploração não está carregando?</string>
   <string name="faq_question_audio_not_playing">Por que meu áudio não está tocando?</string>
   <string name="faq_question_delete_profile">Como posso deletar um perfil?</string>
+  <string name="faq_question_update_app">Como eu atualizo o aplicativo?</string>
+  <string name="faq_question_update_os">Como eu atualizo meu sistema operacional Android?</string>
   <string name="faq_question_cant_find_question">Não consigo encontrar minha pergunta aqui. E agora?</string>
   <string name="faq_answer_whats_oppia">&lt;p&gt;%1$s &lt;i&gt;\"O-pee-yah\"&lt;/i&gt; (Finnish) - \"aprender\"&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;%1$s tem a missão de ajudar qualquer pessoa a aprender o que quiser de uma forma eficaz e agradável.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Ao criar um conjunto de aulas gratuitas, de alta qualidade e comprovadamente eficazes com a ajuda de educadores de todo o mundo, %1$s visa proporcionar aos alunos uma educação de qualidade - independentemente de onde estejam ou a quais recursos tradicionais tenham acesso.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Como estudante, você pode começar sua aventura de aprendizado navegando pelos tópicos listados na página inicial!&lt;/p&gt;</string>
-  <string name="faq_answer_whos_an_admin">&lt;p&gt;Um administrador é o usuário principal que gerencia perfis e configurações para cada perfil em sua conta. Provavelmente, eles são seus pais, professores ou responsáveis ​​que criaram este perfil para você.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Os administradores podem gerenciar perfis, atribuir PINs e alterar outras configurações em suas contas. Dependendo do seu perfil, as permissões de administrador podem ser necessárias para determinados recursos, como download de tópicos, alteração do PIN e mais. &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Para ver quem é o seu administrador, vá para o Seletor de perfil. O primeiro perfil listado e com \"Administrador\" escrito em seu nome é o Administrador. &lt;/p&gt;</string>
-  <string name="faq_answer_create_profile">&lt;p&gt;Se é a sua primeira vez criando um perfil e você não tem um PIN:&lt;ol&gt; &lt;li&gt; No Seletor de Perfil, toque em &lt;strong&gt;Configurar Múltiplos Perfis&lt;/strong&gt;. &lt;/li&gt; &lt;li&gt; Crie um PIN e &lt;strong&gt;Salvar&lt;/strong&gt;. &lt;/li&gt; &lt;li&gt; Preencha todos os campos do perfil. &lt;ol&gt; &lt;li&gt; (Opcional) Carregue uma foto. &lt;/li&gt; &lt;li&gt; Insira um nome. &lt;/li&gt; &lt;li&gt; (Opcional) Atribua um PIN de 3 dígitos. &lt;/li&gt;&lt;/ol&gt;&lt;/li&gt;&lt;li&gt; 4. Toque em &lt;strong&gt;Criar&lt;/strong&gt;. Este perfil está adicionado ao seu Seletor de Perfil! &lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;p&gt; Se você já criou um perfil antes e tem um PIN: &lt;ol&gt; &lt;li&gt;No Seletor de Perfil, toque em &lt;strong&gt;Adicionar Perfil&lt;/strong&gt;. &lt;/li&gt; &lt;li&gt; 2. Digite seu PIN e toque em &lt;strong&gt;Enviar&lt;/strong&gt;. &lt;/li&gt; &lt;li&gt; Preencha todos os campos do perfil. &lt;ol&gt; &lt;li&gt; (Opcional) Carregue uma foto. &lt;/li&gt; &lt;li&gt; Insira um nome. &lt;/li&gt; &lt;li&gt; (Opcional) Atribua um PIN de 3 dígitos. &lt;/li&gt; &lt;/ol&gt; &lt;/li&gt; &lt;li&gt; 4. Toque em &lt;strong&gt;Criar&lt;/strong&gt;. Este perfil está adicionado ao seu Seletor de Perfil! &lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;br&gt;&lt;p&gt; Nota: Apenas o &lt;u&gt;Administrador&lt;/u&gt; pode gerenciar perfis.&lt;/p&gt;</string>
-  <string name="faq_answer_exploration_player">&lt;p&gt;Se a exploração não estiver carregando&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Verifique se o aplicativo está atualizado:&lt;/p&gt;&lt;p&gt; &lt;ul&gt; &lt;li&gt; Acesse a Play Store e certifique-se de que o aplicativo esteja atualizado com a versão mais recente &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Verifique sua conexão com a internet:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Se sua conexão com a Internet estiver lenta, tente se reconectar à rede Wi-Fi ou conectar-se a uma rede diferente. &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Peça ao administrador para verificar o dispositivo e a conexão com a Internet:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Peça ao administrador para solucionar o problema usando as etapas acima &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Informe-nos se você ainda tiver problemas com o carregamento::&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Relate um problema entrando em contato conosco em admin@oppia.org. &lt;/li&gt; &lt;/ul&gt;</string>
-  <string name="faq_answer_audio_not_playing">&lt;p&gt;Se o seu áudio não estiver tocando&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Verifique se o aplicativo está atualizado:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Acesse a Play Store e certifique-se de que o aplicativo esteja atualizado com a versão mais recente &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Verifique sua conexão com a internet:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Se sua conexão com a Internet estiver lenta, tente se reconectar à rede Wi-Fi ou conectar-se a uma rede diferente. A Internet lenta pode fazer com que o áudio carregue irregularmente, dificultando a reprodução. &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Peça ao administrador para verificar o dispositivo e a conexão com a Internet:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Peça ao administrador para solucionar o problema usando as etapas acima&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Informe-nos se você ainda tiver problemas com o carregamento:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Relate um problema entrando em contato conosco em admin@oppia.org. &lt;/li&gt;&lt;/ul&gt;</string>
-  <string name="faq_answer_delete_profile">&lt;p&gt;Depois que um perfil é deletado:&lt;/p&gt; &lt;ol&gt;&lt;li&gt;O perfil não pode ser recuperado. &lt;/li&gt; &lt;li&gt; As informações do perfil, como nome, fotos e progresso, serão excluídas permanentemente. &lt;/li&gt;&lt;/ol&gt;&lt;p&gt;Para deletar um perfil(excluindo o do &lt;u&gt;Administrador&lt;/u&gt;):&lt;/p&gt; &lt;ol&gt;&lt;li&gt;Na página inicial do administrador, toque no botão de menu no canto superior esquerdo.&lt;/li&gt; &lt;li&gt;Toque em &lt;strong&gt;Controles do Administrador&lt;/strong&gt;.&lt;/li&gt; &lt;li&gt;3. Toque em &lt;strong&gt;Editar Perfis&lt;/strong&gt;.&lt;/li&gt; &lt;li&gt;4. Toque no perfil que deseja excluir.&lt;/li&gt; &lt;li&gt;5. Na parte inferior da tela, toque em &lt;strong&gt;Exclusão de Perfil&lt;/strong&gt;.&lt;/li&gt; &lt;li&gt;6. Toque em &lt;strong&gt;Deletar&lt;/strong&gt; para confirmar a exclusão.&lt;/li&gt;&lt;/ol&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Nota: Apenas o &lt;u&gt;Administrador&lt;/u&gt; pode gerenciar perfis.&lt;/p&gt;</string>
+  <string name="faq_answer_whos_an_admin">&lt;p&gt;Um administrador é o usuário principal que gerencia perfis e configurações de cada perfil da conta. Provavelmente foram seus pais, professores ou responsáveis ​​que criaram este perfil para você.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Os administradores podem gerenciar perfis, atribuir PINs e alterar outras configurações. sob sua conta. Dependendo do seu perfil, podem ser necessárias permissões de administrador para determinados recursos, como alteração do PIN e muito mais.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Para ver quem é o seu administrador, acesse o Perfil. Seletor. O primeiro perfil listado e com \"Administrador\" escrito em seu nome é o Administrador.&lt;/p&gt;</string>
+  <string name="faq_answer_create_profile">&lt;p&gt;Se for a primeira vez que você cria um perfil e você não tem um PIN:&lt;ol&gt;&lt;li&gt;No Seletor de perfil, toque em &lt;strong&gt;Configurar vários perfis&lt;/strong&gt;.&lt;/li&gt;&lt; li&gt;Crie um PIN e &lt;strong&gt;Salve&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;Preencha todos os campos do perfil.&lt;ol&gt;&lt;li&gt;(Opcional) Faça upload de uma foto.&lt;/li&gt;&lt;li&gt; Digite um nome.&lt;/li&gt;&lt;li&gt;(Opcional) Atribua um PIN de três dígitos.&lt;/li&gt;&lt;/ol&gt;&lt;/li&gt;&lt;li&gt;Toque em &lt;strong&gt;Criar&lt;/strong&gt;. Este perfil será adicionado ao seu Seletor de perfil!&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;p&gt;Se você já criou um perfil e possui um PIN:&lt;ol&gt;&lt;li&gt;No Seletor de perfil, toque em &lt; strong&gt;Adicionar perfil&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;Insira seu PIN e toque em &lt;strong&gt;Enviar&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;Preencha todos os campos do perfil.&lt;ol&gt;&lt;li &gt;(Opcional) Faça upload de uma foto.&lt;/li&gt;&lt;li&gt;Digite um nome.&lt;/li&gt;&lt;li&gt;(Opcional) Atribua um PIN de três dígitos.&lt;/li&gt;&lt;/ol&gt;&lt;/li&gt;&lt;li &gt;Toque em &lt;strong&gt;Criar&lt;/strong&gt;. Este perfil é adicionado ao seu Seletor de perfil!&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Observação: somente o &lt;u&gt;Administrador&lt;/u&gt; pode gerenciar perfis.&lt;/p&gt;</string>
+  <string name="faq_answer_app_language">&lt;p&gt;O aplicativo %s atualmente oferece suporte a inglês, português do Brasil, árabe, suaíli e pidgin nigeriano. Escolha um desses idiomas no menu, em Opções. Para solicitar o aplicativo em seu idioma, entre em contato conosco pelo e-mail &lt;strong&gt;admin@oppia.org&lt;/strong&gt;.&lt;/p&gt;</string>
+  <string name="faq_answer_bug_reporting">&lt;p&gt;&lt;ol&gt;&lt;li&gt;Na tela inicial do aplicativo %s, toque no menu no canto superior esquerdo.&lt;/li&gt;&lt;li&gt;Toque em &lt;strong&gt;Compartilhar feedback&lt;/strong&gt;.&lt;/li&gt;&lt;li &gt;Siga as instruções para relatar o bug ou compartilhar comentários.&lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;</string>
+  <string name="faq_answer_math_lessons">&lt;p&gt;A missão do %1$s é ajudar os alunos a adquirir as habilidades necessárias para a vida. A matemática é uma habilidade essencial na vida cotidiana. %1$s oferecerá novas aulas sobre ciências e outros assuntos em breve!&lt;/p&gt;</string>
+  <string name="faq_answer_more_lessons">&lt;p&gt;Sim, %s oferecerá novas aulas sobre ciências e outros assuntos em breve. Por favor, volte para atualizações!&lt;/p&gt;</string>
+  <string name="faq_answer_exploration_player">&lt;p&gt;Se o Exploration Player não estiver carregando&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Verifique se o aplicativo está atualizado:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;Acesse na Play Store e verifique se o aplicativo está atualizado para a versão mais recente&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Verifique sua conexão com a Internet:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Se sua conexão com a Internet estiver lenta, tente reconectar-se à rede Wi-Fi ou conectar-se a uma rede diferente.&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Peça ao administrador para verificar o dispositivo e a conexão com a Internet:&lt;/p&gt; &lt;ul&gt;&lt;li&gt;Peça ao administrador para solucionar o problema usando as etapas acima&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Informe-nos se você ainda tiver problemas com o carregamento:&lt;/p &gt;&lt;ul&gt;&lt;li&gt;Informe um problema entrando em contato conosco pelo e-mail admin@oppia.org.&lt;/li&gt;&lt;/ul&gt;</string>
+  <string name="faq_answer_audio_not_playing">&lt;p&gt;Se o áudio não estiver sendo reproduzido&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Verifique se o aplicativo está atualizado:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;Vá para o Play Store e verifique se o aplicativo está atualizado para a versão mais recente&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Verifique sua conexão com a Internet:&lt;/p&gt;&lt;ul&gt;&lt;li&gt;Se sua conexão com a Internet está lenta, tente reconectar-se à sua rede Wi-Fi ou conectar-se a uma rede diferente. A Internet lenta pode fazer com que o áudio carregue irregularmente, dificultando a reprodução.&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Peça ao administrador para verificar o dispositivo e a conexão com a Internet:&lt;/ p&gt;&lt;ul&gt;&lt;li&gt;Peça ao administrador para solucionar o problema usando as etapas acima&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Informe-nos se você ainda tiver problemas com o carregamento:&lt; /p&gt;&lt;ul&gt;&lt;li&gt;Informe um problema entrando em contato conosco pelo e-mail admin@oppia.org.&lt;/li&gt;&lt;/ul&gt;</string>
+  <string name="faq_answer_delete_profile">&lt;p&gt;Depois que um perfil for excluído:&lt;/p&gt;&lt;ol&gt;&lt;li&gt;O perfil não poderá ser recuperado.&lt;/li&gt;&lt;li&gt;As informações do perfil, como nome, fotos e progresso, serão excluídas permanentemente.&lt;/li &lt;/ol&gt;&lt;p&gt;Para excluir um perfil (excluindo o &lt;u&gt;Administrador&lt;/u&gt;):&lt;/p&gt;&lt;ol&gt;&lt;li&gt;Na página inicial do administrador, toque no botão de menu no canto superior esquerdo .&lt;/li&gt;&lt;li&gt;Toque em &lt;strong&gt;Controles do administrador&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;Toque em &lt;strong&gt;Editar perfis&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;Toque no perfil você deseja excluir.&lt;/li&gt;&lt;li&gt;Na parte inferior da tela, toque em &lt;strong&gt;Exclusão de perfil&lt;/strong&gt;.&lt;/li&gt;&lt;li&gt;Toque em &lt;strong&gt;Excluir&lt;/strong&gt; para confirmar a exclusão .&lt;/li&gt;&lt;/ol&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Nota: Somente o &lt;u&gt;Administrador&lt;/u&gt; pode gerenciar perfis.&lt;/p&gt;</string>
+  <string name="faq_answer_update_app">&lt;p&gt;&lt;ol&gt;&lt;li&gt;Abra o aplicativo Google Play Store.&lt;/li&gt;&lt;li&gt;Procure o aplicativo %s.&lt;/li&gt;&lt;li&gt;Toque em Atualizar.&lt;/li&gt;&lt;/ol&gt;&lt;/ p&gt;</string>
+  <string name="faq_answer_update_os">&lt;p&gt;&lt;ol&gt;&lt;li&gt;Toque no aplicativo Configurações do seu telefone.&lt;/li&gt;&lt;li&gt;Toque em Atualizações do sistema.&lt;/li&gt;&lt;li&gt;Toque em Atualizações do sistema e siga as instruções para atualizar seu sistema operacional Android.&lt;/li &lt;/ol&gt;&lt;/p&gt;</string>
   <string name="faq_answer_cant_find_question">&lt;p&gt;Se você não consegue encontrar sua pergunta ou gostaria de relatar um problema, entre em contato conosco em admin@oppia.org.&lt;/p&gt;</string>
   <string name="profile_edit_fragment_test_activity_label">Atividade de Teste de Fragmento de Edição de Perfil</string>
   <string name="administrator_controls_fragment_test_activity_label">Controle Administrativo da Atividade de Teste de Fragmento</string>
@@ -532,4 +579,52 @@
   <string name="nps_score_question">Em uma escala de 0 a 10, qual é a probabilidade de você recomendar %s a um amigo ou colega?</string>
   <string name="previous_subtopic_talkback_text">O subtópico anterior é %s</string>
   <string name="next_subtopic_talkback_text">O próximo subtópico é %s</string>
+  <string name="app_info_icon_content_description">Informações do aplicativo</string>
+  <string name="spotlight_overlay_arrow_content_description">Seta de sobreposição do cursor</string>
+  <string name="close_spotlight_button_content_description">Fechar cursor</string>
+  <string name="previous_state_navigation_button_content_description">Botão de navegação do estado anterior</string>
+  <string name="developer_options_icon_content_description">Ícone de opções do desenvolvedor</string>
+  <string name="administrator_controls_icon_content_description">Ícone de controles do administrador</string>
+  <string name="options_menu_content_description">Menu de opções</string>
+  <string name="previous_button_content_description">Botão Anterior</string>
+  <string name="next_button_content_description">Próximo botão</string>
+  <string name="language_icon_content_description">Ícone de idioma</string>
+  <string name="setting_icon_content_description">Ícone de configuração</string>
+  <string name="profile_picture_image_view_content_description">Visualização da imagem da foto do perfil</string>
+  <string name="lock_icon_content_description">Ícone de cadeado</string>
+  <string name="download_status_image_content_description">Estado de download</string>
+  <string name="font_scale_html_content_text">Conteúdo HTML</string>
+  <string name="onboarding_language_activity_title">Bem vindo a %s!</string>
+  <string name="onboarding_language_activity_subtitle">Aprenda matemática gratuitamente, a qualquer hora!</string>
+  <string name="onboarding_language_activity_text">Feito para estudantes de 7 a 14 anos</string>
+  <string name="onboarding_language_activity_select_label">Selecione um idioma para começar</string>
+  <string name="onboarding_language_activity_explanation_text">Você pode alterar sua seleção de idioma a qualquer momento nas configurações do aplicativo</string>
+  <string name="onboarding_language_activity_button_text">Vamos lá!</string>
+  <string name="onboarding_profile_type_activity_title">Selecione o tipo de perfil</string>
+  <string name="onboarding_profile_type_activity_header">Conte-nos mais sobre você!</string>
+  <string name="onboarding_profile_type_activity_student_text">Sou estudante e quero aprender coisas novas!</string>
+  <string name="onboarding_profile_type_activity_parent_text">Sou pai, professor ou responsável por um aluno.</string>
+  <string name="onboarding_step_count_two">PASSO 2 DE 5</string>
+  <string name="create_profile_activity_title">Criar perfil</string>
+  <string name="create_profile_activity_header">Como devemos chamá-lo?</string>
+  <string name="create_profile_activity_nickname_label">Apelido</string>
+  <string name="create_profile_activity_profile_picture_prompt">Toque aqui para adicionar uma foto</string>
+  <string name="create_profile_activity_nickname_error">Clique na caixa acima para digitar seu apelido.</string>
+  <string name="create_profile_activity_edit_icon_content_description">Editar foto do perfil</string>
+  <string name="create_profile_activity_current_picture_content_description">Foto do perfil atual</string>
+  <string name="onboarding_step_count_three">PASSO 3 DE 5</string>
+  <string name="onboarding_learner_intro_activity_title">Bem-vindo</string>
+  <string name="onboarding_learner_intro_activity_text">Bem-vindo, %s!</string>
+  <string name="onboarding_learner_intro_classroom_text">Aprenda matemática através de aulas divertidas baseadas em histórias.</string>
+  <string name="onboarding_learner_intro_practice_text">Experimente questões práticas para testar seu conhecimento.</string>
+  <string name="onboarding_learner_intro_feedback_text">Obtenha feedback para melhorar usando as correções de %s.</string>
+  <string name="onboarding_step_count_four">PASSO 4 DE 5</string>
+  <string name="onboarding_otter_content_description">Lontra fofa usando óculos.</string>
+  <string name="onboarding_learner_otter_content_description">Lontra fofa com livros.</string>
+  <string name="onboarding_parent_otter_content_description">Mamãe e bebê lontra.</string>
+  <string name="onboarding_navigation_back">Voltar</string>
+  <string name="onboarding_navigation_continue">Continuar</string>
+  <string name="audio_language_fragment_text">Em %s, você pode ouvir as lições!</string>
+  <string name="audio_language_fragment_subtitle">Selecione a lingua do áudio para ouvir às lições</string>
+  <string name="onboarding_step_count_five">Passo 5 de 5</string>
 </resources>
diff --git a/app/src/main/res/values-sw/strings.xml b/app/src/main/res/values-sw/strings.xml
index 17d2fd54cec..ddb536c4e3e 100644
--- a/app/src/main/res/values-sw/strings.xml
+++ b/app/src/main/res/values-sw/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Authors:
 * Jepkorir
+* Killy95
 * Seanlip
 * VivianW
 -->
@@ -381,6 +382,8 @@
   <string name="unsupported_app_version_dialog_title" fuzzy="true">Toleo la programu lisilotumika</string>
   <string name="unsupported_app_version_dialog_message" fuzzy="true">Toleo hili la programu halitumiki tena. Tafadhali isasishe kupitia hifadhi ya michezo.</string>
   <string name="unsupported_app_version_dialog_close_button_text" fuzzy="true">Funga programu</string>
+  <string name="beta_notice_dialog_close_button_text">Sawa</string>
+  <string name="general_availability_notice_dialog_close_button_text">Sawa</string>
   <string name="ratio_content_description_separator" fuzzy="true">kwa</string>
   <string name="ratio_default_hint_text" fuzzy="true">Weka uwiano katika fomu x:y.</string>
   <string name="smallest_text_size_content_description">Maandishi madogo zaidi</string>
@@ -425,16 +428,10 @@
   <string name="faq_question_update_os" fuzzy="true">Jinsi gani naweza kusasisha mfumo wangu wa Android?</string>
   <string name="faq_question_cant_find_question">Sijapata swali langu hapa. Nini sasa?</string>
   <string name="faq_answer_whats_oppia">&lt;p&gt;%1$s &lt;i&gt;\"O-pee-yah\"&lt;/i&gt; (Kifini) - \"kujifunza\"&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;%1$s\'s dhamira ni kumsaidia mtu yeyote kujifunza chochote anachotaka kwa njia bora na ya kufurahisha.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Kwa kuunda seti ya masomo yasiyolipishwa, ya ubora wa juu, na yenye matokeo kwa usaidizi. ya waelimishaji kutoka duniani kote, %1$s inalenga kuwapa wanafunzi elimu bora — bila kujali walipo au ni nyenzo gani za jadi wanazoweza kufikia.&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt; Kama mwanafunzi, unaweza kuanza safari yako ya kujifunza kwa kuvinjari mada zilizoorodheshwa kwenye Ukurasa wa Mwanzo!&lt;/p&gt;</string>
-  <string name="faq_answer_whos_an_admin">&lt;p&gt;Msimamizi ndiye mtumiaji mkuu anayedhibiti wasifu na mipangilio ya kila wasifu kwenye akaunti yake.Uwezekano mkubwa ni mzazi, mwalimu au mlezi wako aliyekuundia wasifu huu. &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Wasimamizi wana uwezo wa kudhibiti wasifu, kugawa Nambari ya Siri, na kubadilisha mipangilio mingine chini ya akaunti yao. Kulingana na wasifu wako, ruhusa za Msimamizi zinaweza kuhitajika kwa vipengele fulani kama vile kupakua Mada, kubadilisha Nambari yako ya Siri na zaidi. &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Ili kujua Msimamizi wako ni nani, nenda kwa Kichagua Wasifu. Wasifu wa kwanza ulioorodheshwa na una \"Msimamizi\" iliyoandikwa chini ya jina lake ni Msimamizi. &lt;/p&gt;</string>
-  <string name="faq_answer_create_profile">&lt;p&gt;Ikiwa ni mara yako ya kwanza kuunda wasifu na huna Nambari ya Siri: &lt;ol&gt; &lt;li&gt; Kutoka kwa Kichagua Wasifu, gusa &lt;strong&gt;Weka Wasifu Nyingi&lt;/strong&gt;. &lt;/li&gt; &lt;li&gt; Unda Nambari ya Siri na &lt;strong&gt;Hifadhi&lt;/strong&gt;. &lt;/li&gt; &lt;li&gt; Jaza sehemu zote za wasifu. &lt;ol&gt;&lt;li&gt; (Si lazima) Pakia picha. &lt;/li&gt; &lt;li&gt; Weka jina. &lt;/li&gt; &lt;li&gt; (Si lazima) Weka Nambari ya Siri yenye tarakimu 3.&lt;/li&gt;&lt;/ol&gt;&lt;/li&gt;&lt;li&gt;Gusa &lt;strong&gt;Unda&lt;/strong&gt;. Wasifu huu umeongezwa kwa Kichagua Wasifu wako! &lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;p&gt; Ikiwa umeunda wasifu hapo awali na una Nambari ya Siri: &lt;ol&gt;&lt;li&gt; Kutoka kwa Kichagua Wasifu, gusa &lt;strong&gt;Ongeza Wasifu&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Weka Nambari yako ya Siri na uguse &lt;strong&gt;Wasilisha&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt; Jaza sehemu zote za wasifu. &lt;ol&gt;&lt;li&gt; (Si lazima) Pakia picha. &lt;/li&gt; &lt;li&gt; Weka jina. &lt;/li&gt; &lt;li&gt; (Si lazima) Weka Nambari ya Siri yenye tarakimu 3. &lt;/li&gt;&lt;/ol&gt;&lt;/li&gt;&lt;li&gt; Gusa &lt;strong&gt;Unda&lt;/strong&gt;. Wasifu huu umeongezwa kwa Kichagua Wasifu wako! &lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;br&gt;&lt;p&gt; Kumbuka: &lt;u&gt;Msimamizi pekee&lt;/u&gt; ndiye anayeweza kudhibiti wasifu.&lt;/p&gt;</string>
-  <string name="faq_answer_app_language" fuzzy="true"><p>Programu ya %s kwa sasa inasaidia Kiingereza, Kireno cha Brazil, Kiarabu, Kiswahili, na Kipidgin cha Nigeria. Chagua moja ya lugha hizi kwenye menyu, chini ya Chaguo. Ili kuomba programu kwa lugha yako, tafadhali wasiliana nasi kwa <strong>admin@oppia.org</strong>.</p></string>
-  <string name="faq_answer_bug_reporting" fuzzy="true"><p><ol><li>Kutoka kwenye skrini kuu ya programu yako ya %s, bonyeza menyu kwenye kona ya juu kushoto.</li><li>Bonyeza <strong>Shiriki Maoni</strong>.</li><li>Fuata maagizo ya kuripoti mdudu au kushiriki maoni.</li></ol></p></string>
-  <string name="faq_answer_math_lessons" fuzzy="true"><p>Malengo ya %1$s ni kusaidia wanafunzi kupata stadi muhimu za maisha. Hisabati ni stadi muhimu katika maisha ya kila siku. %1$s itatoa masomo mapya kuhusu sayansi na masomo mengine hivi karibuni!</p></string>
-  <string name="faq_answer_more_lessons" fuzzy="true"><p>Ndiyo, %s itatoa masomo mapya kuhusu sayansi na masomo mengine hivi karibuni. Tafadhali rudia kwa ajili ya habari mpya!</p></string>
-  <string name="faq_answer_exploration_player">&lt;p&gt;Ikiwa Kicheza Ugunduzi hakipakii&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Angalia kama programu imesasishwa:&lt;/p&gt;&lt;p&gt; &lt;ul&gt; &lt;li&gt; Nenda kwenye Hifadhi ya Michezo na uhakikishe kuwa programu imesasishwa hadi toleo lake jipya zaidi &lt;/li&gt; &lt;/ul&gt; &lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Angalia muunganisho wako wa mtandao:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Ikiwa muunganisho wako wa mtandao ni wa polepole, jaribu kuunganisha tena kwenye mtandao wako wa Wi-Fi au unganisha kwenye mtandao tofauti. &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Uliza Msimamizi aangalie kifaa chake na muunganisho wa mtandao:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Pata Msimamizi kusuluhisha kwa kutumia hatua hapo juu &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Tujulishe ikiwa bado una matatizo ya upakiaji:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Ripoti tatizo kwa kuwasiliana nasi kwa admin@oppia.org. &lt;/li&gt;&lt;/ul&gt;</string>
-  <string name="faq_answer_audio_not_playing">&lt;p&gt;Ikiwa sauti yako haichezi&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Angalia ili kuona kama programu imesasishwa:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Nenda kwenye Hifadhi ya Michezo na uhakikishe kuwa programu imesasishwa hadi toleo lake jipya zaidi &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Angalia muunganisho wako wa mtandao:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Iwapo muunganisho wako wa mtandao ni wa polepole, jaribu kuunganisha tena kwenye mtandao wako wa Wi-Fi au unganisha kwenye mtandao tofauti. Mtandao wa polepole unaweza kusababisha sauti kupakia kwa njia isiyo ya kawaida, na kuifanya iwe vigumu kucheza. &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Uliza Msimamizi aangalie kifaa chake na muunganisho wa mtandao:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Wasiliana na Msimamizi ili asuluhishe kwa kutumia hatua hapo juu&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Tujulishe ikiwa bado una matatizo ya upakiaji:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Ripoti tatizo kwa kuwasiliana nasi kwa admin@oppia.org. &lt;/li&gt;&lt;/ul&gt;</string>
-  <string name="faq_answer_delete_profile">&lt;p&gt;Wasifu unapofutwa:&lt;/p&gt;&lt;ol&gt;&lt;li&gt; Wasifu hauwezi kurejeshwa. &lt;/li&gt;&lt;li&gt; Taarifa ya wasifu kama vile jina, picha na maendeleo yatafutwa kabisa. &lt;/li&gt;&lt;/ol&gt;&lt;p&gt;Ili kufuta wasifu (bila kujumuisha &lt;u&gt;Msimamizi&lt;/u&gt;):&lt;/p&gt; &lt;ol&gt;&lt;li&gt; Kutoka kwa Ukurasa wa Mwanzo wa Msimamizi, gusa kitufe cha menyu kilicho upande wa juu kushoto. &lt;/li&gt;&lt;li&gt; Gusa &lt;strong&gt;Vidhibiti vya Msimamizi&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt; Gusa &lt;strong&gt;Hariri Wasifu&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt; Gonga Wasifu ambao ungependa kufuta. &lt;/li&gt;&lt;li&gt; Katika sehemu ya chini ya skrini, gusa &lt;strong&gt;Ufutaji wa Wasifu&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt; Gusa &lt;strong&gt;Futa&lt;/strong&gt; ili kuthibitisha kufuta.&lt;/li&gt;&lt;/ol&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Kumbuka: &lt;u&gt;Msimamizi&lt;/u&gt; pekee ndiye anayeweza kudhibiti wasifu.&lt;/p&gt;</string>
-  <string name="faq_answer_update_app" fuzzy="true"><p><ol><li>Fungua programu ya Duka la Google Play.</li><li>Tafuta programu ya %s.</li><li>Bonyeza Sasisha.</li></ol></p></string>
-  <string name="faq_answer_update_os" fuzzy="true"><p><ol><li>Bonyeza programu ya Mipangilio kwenye simu yako.</li><li>Bonyeza Sasisho la mfumo.</li><li>Bonyeza Sasisho la mfumo na fuata maagizo ya kusasisha mfumo wako wa uendeshaji wa Android.</li></ol></p></string>
+  <string name="faq_answer_whos_an_admin" fuzzy="true">&lt;p&gt;Msimamizi ndiye mtumiaji mkuu anayedhibiti wasifu na mipangilio ya kila wasifu kwenye akaunti yake.Uwezekano mkubwa ni mzazi, mwalimu au mlezi wako aliyekuundia wasifu huu. &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Wasimamizi wana uwezo wa kudhibiti wasifu, kugawa Nambari ya Siri, na kubadilisha mipangilio mingine chini ya akaunti yao. Kulingana na wasifu wako, ruhusa za Msimamizi zinaweza kuhitajika kwa vipengele fulani kama vile kupakua Mada, kubadilisha Nambari yako ya Siri na zaidi. &lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Ili kujua Msimamizi wako ni nani, nenda kwa Kichagua Wasifu. Wasifu wa kwanza ulioorodheshwa na una \"Msimamizi\" iliyoandikwa chini ya jina lake ni Msimamizi. &lt;/p&gt;</string>
+  <string name="faq_answer_create_profile" fuzzy="true">&lt;p&gt;Ikiwa ni mara yako ya kwanza kuunda wasifu na huna Nambari ya Siri: &lt;ol&gt; &lt;li&gt; Kutoka kwa Kichagua Wasifu, gusa &lt;strong&gt;Weka Wasifu Nyingi&lt;/strong&gt;. &lt;/li&gt; &lt;li&gt; Unda Nambari ya Siri na &lt;strong&gt;Hifadhi&lt;/strong&gt;. &lt;/li&gt; &lt;li&gt; Jaza sehemu zote za wasifu. &lt;ol&gt;&lt;li&gt; (Si lazima) Pakia picha. &lt;/li&gt; &lt;li&gt; Weka jina. &lt;/li&gt; &lt;li&gt; (Si lazima) Weka Nambari ya Siri yenye tarakimu 3.&lt;/li&gt;&lt;/ol&gt;&lt;/li&gt;&lt;li&gt;Gusa &lt;strong&gt;Unda&lt;/strong&gt;. Wasifu huu umeongezwa kwa Kichagua Wasifu wako! &lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;p&gt; Ikiwa umeunda wasifu hapo awali na una Nambari ya Siri: &lt;ol&gt;&lt;li&gt; Kutoka kwa Kichagua Wasifu, gusa &lt;strong&gt;Ongeza Wasifu&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt;Weka Nambari yako ya Siri na uguse &lt;strong&gt;Wasilisha&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt; Jaza sehemu zote za wasifu. &lt;ol&gt;&lt;li&gt; (Si lazima) Pakia picha. &lt;/li&gt; &lt;li&gt; Weka jina. &lt;/li&gt; &lt;li&gt; (Si lazima) Weka Nambari ya Siri yenye tarakimu 3. &lt;/li&gt;&lt;/ol&gt;&lt;/li&gt;&lt;li&gt; Gusa &lt;strong&gt;Unda&lt;/strong&gt;. Wasifu huu umeongezwa kwa Kichagua Wasifu wako! &lt;/li&gt;&lt;/ol&gt;&lt;/p&gt;&lt;br&gt;&lt;p&gt; Kumbuka: &lt;u&gt;Msimamizi pekee&lt;/u&gt; ndiye anayeweza kudhibiti wasifu.&lt;/p&gt;</string>
+  <string name="faq_answer_exploration_player" fuzzy="true">&lt;p&gt;Ikiwa Kicheza Ugunduzi hakipakii&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Angalia kama programu imesasishwa:&lt;/p&gt;&lt;p&gt; &lt;ul&gt; &lt;li&gt; Nenda kwenye Hifadhi ya Michezo na uhakikishe kuwa programu imesasishwa hadi toleo lake jipya zaidi &lt;/li&gt; &lt;/ul&gt; &lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Angalia muunganisho wako wa mtandao:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Ikiwa muunganisho wako wa mtandao ni wa polepole, jaribu kuunganisha tena kwenye mtandao wako wa Wi-Fi au unganisha kwenye mtandao tofauti. &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Uliza Msimamizi aangalie kifaa chake na muunganisho wa mtandao:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Pata Msimamizi kusuluhisha kwa kutumia hatua hapo juu &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Tujulishe ikiwa bado una matatizo ya upakiaji:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Ripoti tatizo kwa kuwasiliana nasi kwa admin@oppia.org. &lt;/li&gt;&lt;/ul&gt;</string>
+  <string name="faq_answer_audio_not_playing" fuzzy="true">&lt;p&gt;Ikiwa sauti yako haichezi&lt;/p&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Angalia ili kuona kama programu imesasishwa:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Nenda kwenye Hifadhi ya Michezo na uhakikishe kuwa programu imesasishwa hadi toleo lake jipya zaidi &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Angalia muunganisho wako wa mtandao:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Iwapo muunganisho wako wa mtandao ni wa polepole, jaribu kuunganisha tena kwenye mtandao wako wa Wi-Fi au unganisha kwenye mtandao tofauti. Mtandao wa polepole unaweza kusababisha sauti kupakia kwa njia isiyo ya kawaida, na kuifanya iwe vigumu kucheza. &lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Uliza Msimamizi aangalie kifaa chake na muunganisho wa mtandao:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Wasiliana na Msimamizi ili asuluhishe kwa kutumia hatua hapo juu&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Tujulishe ikiwa bado una matatizo ya upakiaji:&lt;/p&gt;&lt;ul&gt;&lt;li&gt; Ripoti tatizo kwa kuwasiliana nasi kwa admin@oppia.org. &lt;/li&gt;&lt;/ul&gt;</string>
+  <string name="faq_answer_delete_profile" fuzzy="true">&lt;p&gt;Wasifu unapofutwa:&lt;/p&gt;&lt;ol&gt;&lt;li&gt; Wasifu hauwezi kurejeshwa. &lt;/li&gt;&lt;li&gt; Taarifa ya wasifu kama vile jina, picha na maendeleo yatafutwa kabisa. &lt;/li&gt;&lt;/ol&gt;&lt;p&gt;Ili kufuta wasifu (bila kujumuisha &lt;u&gt;Msimamizi&lt;/u&gt;):&lt;/p&gt; &lt;ol&gt;&lt;li&gt; Kutoka kwa Ukurasa wa Mwanzo wa Msimamizi, gusa kitufe cha menyu kilicho upande wa juu kushoto. &lt;/li&gt;&lt;li&gt; Gusa &lt;strong&gt;Vidhibiti vya Msimamizi&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt; Gusa &lt;strong&gt;Hariri Wasifu&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt; Gonga Wasifu ambao ungependa kufuta. &lt;/li&gt;&lt;li&gt; Katika sehemu ya chini ya skrini, gusa &lt;strong&gt;Ufutaji wa Wasifu&lt;/strong&gt;. &lt;/li&gt;&lt;li&gt; Gusa &lt;strong&gt;Futa&lt;/strong&gt; ili kuthibitisha kufuta.&lt;/li&gt;&lt;/ol&gt;&lt;p&gt;&lt;br&gt;&lt;/p&gt;&lt;p&gt;Kumbuka: &lt;u&gt;Msimamizi&lt;/u&gt; pekee ndiye anayeweza kudhibiti wasifu.&lt;/p&gt;</string>
   <string name="faq_answer_cant_find_question">&lt;p&gt;Ikiwa huwezi kupata swali lako au ungependa kuripoti hitilafu, wasiliana nasi kwa admin@oppia.org.&lt;/p&gt;</string>
 </resources>

From ec5a4f0243bb4b476fe8143ae7005b5f34716631 Mon Sep 17 00:00:00 2001
From: Sneha Datta <snehadatta431@gmail.com>
Date: Tue, 29 Oct 2024 12:46:12 +0530
Subject: [PATCH 3/6] Fix #5329: Add color formatting to static check messages
 (#5540)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
Fixes #5329

This PR implements color-coded messages for static checks to improve
experience. Error messages are displayed in red for failing checks,
while warnings are shown in yellow. Successful checks are indicated with
green messages.
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).

## For UI-specific PRs only
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- For PRs introducing new UI elements or color changes, both light and
dark mode screenshots must be included
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing

---------

Co-authored-by: Adhiambo Peres <59600948+adhiamboperes@users.noreply.github.com>
---
 scripts/buf_lint_check.sh        |  8 +++++---
 scripts/buildifier_lint_check.sh |  6 ++++--
 scripts/checkstyle_lint_check.sh |  6 ++++--
 scripts/feature_flags_check.sh   | 10 ++++++----
 scripts/formatting.sh            | 30 ++++++++++++++++++++++++++++++
 scripts/ktlint_lint_check.sh     |  8 +++++---
 scripts/pre-push.sh              |  4 +++-
 7 files changed, 57 insertions(+), 15 deletions(-)
 create mode 100644 scripts/formatting.sh

diff --git a/scripts/buf_lint_check.sh b/scripts/buf_lint_check.sh
index c5cbfed35ec..b355f2af16b 100644
--- a/scripts/buf_lint_check.sh
+++ b/scripts/buf_lint_check.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source scripts/formatting.sh
+
 jar_file_path=$?
 config_file_path=$?
 os_type=$?
@@ -15,11 +17,11 @@ lint_protobuf_files() {
   status=$?
 
   if [ "$status" = 0 ] ; then
-    echo "Protobuf lint check completed successfully"
+    echo_success "Protobuf lint check completed successfully"
     exit 0
   else
     echo "********************************"
-    echo "Protobuf lint check issues found. Please fix them before pushing your code."
+    echo_error "Protobuf lint check issues found. Please fix them before pushing your code."
     echo "********************************"
     exit 1
   fi
@@ -57,7 +59,7 @@ check_os_type() {
   elif [[ "$OSTYPE" == "darwin"* ]]; then
     os_type="Darwin"
   else
-    echo "Protobuf lint check not available on $OSTYPE"
+    echo_error "Protobuf lint check not available on $OSTYPE"
     exit 0
   fi
 }
diff --git a/scripts/buildifier_lint_check.sh b/scripts/buildifier_lint_check.sh
index 52e0857468e..b56487f6b2f 100644
--- a/scripts/buildifier_lint_check.sh
+++ b/scripts/buildifier_lint_check.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source scripts/formatting.sh
+
 echo "********************************"
 echo "Checking Bazel file formatting"
 echo "********************************"
@@ -19,12 +21,12 @@ $buildifier_file_path --lint=warn --mode=check --warnings=-native-android,+out-o
 status=$?
 
 if [ "$status" = 0 ] ; then
-  echo "Buildifier lint check completed successfully"
+  echo_success "Buildifier lint check completed successfully"
   exit 0
 else
   # Assume any lint output or non-zero exit code is a failure.
   echo "********************************"
-  echo "Buildifier issue found."
+  echo_error "Buildifier issue found."
   echo "Please fix the above issues."
   echo "********************************"
   exit 1
diff --git a/scripts/checkstyle_lint_check.sh b/scripts/checkstyle_lint_check.sh
index 668be1ba670..1b682d8b615 100644
--- a/scripts/checkstyle_lint_check.sh
+++ b/scripts/checkstyle_lint_check.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source scripts/formatting.sh
+
 echo "********************************"
 echo "Checking Java file formatting"
 echo "********************************"
@@ -23,11 +25,11 @@ echo $lint_results
 if [ "$lint_command_result" -ne 0 ] || [ -z "$lint_results" ] || [[ ${lint_results} == *"[WARN]"* ]]; then
   # Assume any lint output or non-zero exit code is a failure.
   echo "********************************"
-  echo "Checkstyle issue found."
+  echo_error "Checkstyle issue found."
   echo "Please fix the above issues."
   echo "********************************"
   exit 1
 else
-  echo "Checkstyle lint check completed successfully"
+  echo_success "Checkstyle lint check completed successfully"
   exit 0
 fi
diff --git a/scripts/feature_flags_check.sh b/scripts/feature_flags_check.sh
index 48e61153a70..92b0e07a10e 100644
--- a/scripts/feature_flags_check.sh
+++ b/scripts/feature_flags_check.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source scripts/formatting.sh
+
 echo "********************************"
 echo "Running feature flag checks"
 echo "********************************"
@@ -120,7 +122,7 @@ function perform_checks_on_feature_flags() {
     in_array=$(item_in_array "$element" "${imported_classes[@]}")
     if [[ $in_array -ne 1 ]]; then
       failed_checks=$((failed_checks + 1))
-      echo "$element is not imported in the constructor argument in $file_path at line $imports_line_number"
+      echo_error "$element is not imported in the constructor argument in $file_path at line $imports_line_number"
     fi
   done
 
@@ -128,16 +130,16 @@ function perform_checks_on_feature_flags() {
     in_array=$(item_in_array "$element" "${flags_added_to_map[@]}")
     if [[ $in_array -ne 1 ]]; then
       failed_checks=$((failed_checks + 1))
-      echo "$element is not added to the logging map in $file_path at line $flags_map_line_number"
+      echo_error "$element is not added to the logging map in $file_path at line $flags_map_line_number"
     fi
   done
 
   if [[ $failed_checks -eq 0 ]]; then
-    echo "Feature flag checks completed successfully"
+    echo_success "Feature flag checks completed successfully"
     exit 0
   else
     echo "********************************"
-    echo "Feature flag issues found."
+    echo_error "Feature flag issues found."
     echo "Please fix the above issues."
     echo "********************************"
     exit 1
diff --git a/scripts/formatting.sh b/scripts/formatting.sh
new file mode 100644
index 00000000000..0fd2c2dac94
--- /dev/null
+++ b/scripts/formatting.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+#Defines color codes for output formatting
+
+# Red color for error messages
+RED='\033[0;31m'
+
+# Green color for success messages
+GREEN='\033[0;32m'
+
+# Yellow color for warnings messages
+YELLOW='\033[0;33m'
+
+# No color, used to reset the color after each message
+NC='\033[0m'
+
+# Function to print an error message in red
+function echo_error() {
+    echo -e "${RED}$1${NC}"
+}
+
+# Function to print a success message in green
+function echo_success() {
+    echo -e "${GREEN}$1${NC}"
+}
+
+# Function to print a warning message in yellow
+function echo_warning() {
+    echo -e "${YELLOW}$1${NC}"
+}
diff --git a/scripts/ktlint_lint_check.sh b/scripts/ktlint_lint_check.sh
index 2713b88d0e0..dab25e7bd64 100755
--- a/scripts/ktlint_lint_check.sh
+++ b/scripts/ktlint_lint_check.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source scripts/formatting.sh
+
 echo "********************************"
 echo "Checking code formatting"
 echo "********************************"
@@ -19,15 +21,15 @@ java -jar $jar_file_path --android app/src/**/*.kt data/src/**/*.kt domain/src/*
 status=$?
 
 if [ "$status" = 0 ] ; then
-  echo "Lint completed successfully."
+  echo_success "Lint completed successfully."
   exit 0
 else
   echo "********************************"
-  echo "Ktlint issue found."
+  echo_error "Ktlint issue found."
   echo "Please fix the above issues.
   You can also use the java -jar $jar_file_path -F --android domain/src/**/*.kt utility/src/**/*.kt data/src/**/*.kt app/src/**/*.kt testing/src/**/*.kt scripts/src/**/*.kt  instrumentation/src/**/*.kt
   command to fix the most common issues."
-  echo "Please note, there might be a possibility where the above command will not fix the issue.
+  echo_warning "Please note, there might be a possibility where the above command will not fix the issue.
   In that case, you will have to fix it yourself."
   echo "********************************"
   exit 1
diff --git a/scripts/pre-push.sh b/scripts/pre-push.sh
index 13d37eeb20e..ea2878926de 100755
--- a/scripts/pre-push.sh
+++ b/scripts/pre-push.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source scripts/formatting.sh
+
 # This script will run the pre-push checks in the given order
 # - ktlint
 # - checkstyle
@@ -7,7 +9,7 @@
 # - (others in the future)
 
 if bash scripts/ktlint_lint_check.sh && bash scripts/checkstyle_lint_check.sh && bash scripts/buf_lint_check.sh ; then
-  echo "All checks passed successfully"
+  echo_success "All checks passed successfully"
   exit 0
 else
   exit 1

From e0abb63f5ec826221f650a3dd6e084a62293d821 Mon Sep 17 00:00:00 2001
From: XichengSpencer <styleclub16@gmail.com>
Date: Tue, 29 Oct 2024 11:28:07 -0400
Subject: [PATCH 4/6] Remove redundant test in BUILD.bazel More cleanup for
 eventloggingconfigurationmodule

---
 .../TextInputLayoutBindingAdaptersTest.kt         | 15 +++++++--------
 .../org/oppia/android/util/logging/BUILD.bazel    | 11 -----------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/TextInputLayoutBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/TextInputLayoutBindingAdaptersTest.kt
index 844f2e70327..e455561e0c6 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/databinding/TextInputLayoutBindingAdaptersTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/TextInputLayoutBindingAdaptersTest.kt
@@ -76,7 +76,6 @@ import org.oppia.android.util.caching.AssetModule
 import org.oppia.android.util.caching.testing.CachingTestModule
 import org.oppia.android.util.gcsresource.GcsResourceModule
 import org.oppia.android.util.locale.LocaleProdModule
-import org.oppia.android.util.logging.EventLoggingConfigurationModule
 import org.oppia.android.util.logging.LoggerModule
 import org.oppia.android.util.logging.SyncStatusModule
 import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule
@@ -167,12 +166,12 @@ class TextInputLayoutBindingAdaptersTest {
 
   private fun launchActivity():
     ActivityScenario<TextInputLayoutBindingAdaptersTestActivity>? {
-      val scenario = ActivityScenario.launch<TextInputLayoutBindingAdaptersTestActivity>(
-        TextInputLayoutBindingAdaptersTestActivity.createIntent(context)
-      )
-      testCoroutineDispatchers.runCurrent()
-      return scenario
-    }
+    val scenario = ActivityScenario.launch<TextInputLayoutBindingAdaptersTestActivity>(
+      TextInputLayoutBindingAdaptersTestActivity.createIntent(context)
+    )
+    testCoroutineDispatchers.runCurrent()
+    return scenario
+  }
 
   private fun setUpTestApplicationComponent() {
     ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
@@ -205,7 +204,7 @@ class TextInputLayoutBindingAdaptersTest {
       MathEquationInputModule::class, SplitScreenInteractionModule::class,
       LoggingIdentifierModule::class, ApplicationLifecycleModule::class,
       SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class,
-      EventLoggingConfigurationModule::class, ActivityRouterModule::class,
+      ActivityRouterModule::class,
       CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class,
       TestAuthenticationModule::class
     ]
diff --git a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel
index de80cc82f38..cb3366a346e 100644
--- a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel
+++ b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel
@@ -110,17 +110,6 @@ kt_android_library(
     visibility = ["//:oppia_api_visibility"],
 )
 
-kt_android_library(
-    name = "event_type_to_human_readable_name_converter",
-    srcs = [
-        "EventTypeToHumanReadableNameConverter.kt",
-    ],
-    deps = [
-        "//model/src/main/proto:event_logger_java_proto_lite",
-        "//third_party:javax_inject_javax_inject",
-    ],
-)
-
 kt_android_library(
     name = "prod_module",
     srcs = [

From 74eded50f2ef07a4b3fe2f29ca5282687c4566a3 Mon Sep 17 00:00:00 2001
From: XichengSpencer <styleclub16@gmail.com>
Date: Tue, 29 Oct 2024 14:41:07 -0400
Subject: [PATCH 5/6] Revert "Remove redundant test in BUILD.bazel More cleanup
 for eventloggingconfigurationmodule"

This reverts commit e0abb63f
---
 .../TextInputLayoutBindingAdaptersTest.kt         | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/TextInputLayoutBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/TextInputLayoutBindingAdaptersTest.kt
index e455561e0c6..844f2e70327 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/databinding/TextInputLayoutBindingAdaptersTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/TextInputLayoutBindingAdaptersTest.kt
@@ -76,6 +76,7 @@ import org.oppia.android.util.caching.AssetModule
 import org.oppia.android.util.caching.testing.CachingTestModule
 import org.oppia.android.util.gcsresource.GcsResourceModule
 import org.oppia.android.util.locale.LocaleProdModule
+import org.oppia.android.util.logging.EventLoggingConfigurationModule
 import org.oppia.android.util.logging.LoggerModule
 import org.oppia.android.util.logging.SyncStatusModule
 import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule
@@ -166,12 +167,12 @@ class TextInputLayoutBindingAdaptersTest {
 
   private fun launchActivity():
     ActivityScenario<TextInputLayoutBindingAdaptersTestActivity>? {
-    val scenario = ActivityScenario.launch<TextInputLayoutBindingAdaptersTestActivity>(
-      TextInputLayoutBindingAdaptersTestActivity.createIntent(context)
-    )
-    testCoroutineDispatchers.runCurrent()
-    return scenario
-  }
+      val scenario = ActivityScenario.launch<TextInputLayoutBindingAdaptersTestActivity>(
+        TextInputLayoutBindingAdaptersTestActivity.createIntent(context)
+      )
+      testCoroutineDispatchers.runCurrent()
+      return scenario
+    }
 
   private fun setUpTestApplicationComponent() {
     ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
@@ -204,7 +205,7 @@ class TextInputLayoutBindingAdaptersTest {
       MathEquationInputModule::class, SplitScreenInteractionModule::class,
       LoggingIdentifierModule::class, ApplicationLifecycleModule::class,
       SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class,
-      ActivityRouterModule::class,
+      EventLoggingConfigurationModule::class, ActivityRouterModule::class,
       CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class,
       TestAuthenticationModule::class
     ]

From c800a57103b4f1f218558ff359f4eee1a84a9c6d Mon Sep 17 00:00:00 2001
From: XichengSpencer <styleclub16@gmail.com>
Date: Tue, 29 Oct 2024 16:07:24 -0400
Subject: [PATCH 6/6] Remove redundant test in test_file_exemptions.textproto
 More cleanup for eventloggingconfigurationmodule

---
 .../TextInputLayoutBindingAdaptersTest.kt         | 15 +++++++--------
 scripts/assets/test_file_exemptions.textproto     |  4 ----
 .../org/oppia/android/util/logging/BUILD.bazel    | 11 +++++++++++
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/src/sharedTest/java/org/oppia/android/app/databinding/TextInputLayoutBindingAdaptersTest.kt b/app/src/sharedTest/java/org/oppia/android/app/databinding/TextInputLayoutBindingAdaptersTest.kt
index 844f2e70327..e455561e0c6 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/databinding/TextInputLayoutBindingAdaptersTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/databinding/TextInputLayoutBindingAdaptersTest.kt
@@ -76,7 +76,6 @@ import org.oppia.android.util.caching.AssetModule
 import org.oppia.android.util.caching.testing.CachingTestModule
 import org.oppia.android.util.gcsresource.GcsResourceModule
 import org.oppia.android.util.locale.LocaleProdModule
-import org.oppia.android.util.logging.EventLoggingConfigurationModule
 import org.oppia.android.util.logging.LoggerModule
 import org.oppia.android.util.logging.SyncStatusModule
 import org.oppia.android.util.logging.firebase.FirebaseLogUploaderModule
@@ -167,12 +166,12 @@ class TextInputLayoutBindingAdaptersTest {
 
   private fun launchActivity():
     ActivityScenario<TextInputLayoutBindingAdaptersTestActivity>? {
-      val scenario = ActivityScenario.launch<TextInputLayoutBindingAdaptersTestActivity>(
-        TextInputLayoutBindingAdaptersTestActivity.createIntent(context)
-      )
-      testCoroutineDispatchers.runCurrent()
-      return scenario
-    }
+    val scenario = ActivityScenario.launch<TextInputLayoutBindingAdaptersTestActivity>(
+      TextInputLayoutBindingAdaptersTestActivity.createIntent(context)
+    )
+    testCoroutineDispatchers.runCurrent()
+    return scenario
+  }
 
   private fun setUpTestApplicationComponent() {
     ApplicationProvider.getApplicationContext<TestApplication>().inject(this)
@@ -205,7 +204,7 @@ class TextInputLayoutBindingAdaptersTest {
       MathEquationInputModule::class, SplitScreenInteractionModule::class,
       LoggingIdentifierModule::class, ApplicationLifecycleModule::class,
       SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class,
-      EventLoggingConfigurationModule::class, ActivityRouterModule::class,
+      ActivityRouterModule::class,
       CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class,
       TestAuthenticationModule::class
     ]
diff --git a/scripts/assets/test_file_exemptions.textproto b/scripts/assets/test_file_exemptions.textproto
index 2a83c6f4b3d..2f4c4422ce9 100644
--- a/scripts/assets/test_file_exemptions.textproto
+++ b/scripts/assets/test_file_exemptions.textproto
@@ -4354,10 +4354,6 @@ test_file_exemption {
   exempted_file_path: "utility/src/main/java/org/oppia/android/util/logging/ConsoleLoggerInjectorProvider.kt"
   test_file_not_required: true
 }
-test_file_exemption {
-  exempted_file_path: "utility/src/main/java/org/oppia/android/util/logging/EventTypeToHumanReadableNameConverter.kt"
-  test_file_not_required: true
-}
 test_file_exemption {
   exempted_file_path: "utility/src/main/java/org/oppia/android/util/logging/ExceptionLogger.kt"
   test_file_not_required: true
diff --git a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel
index cb3366a346e..de80cc82f38 100644
--- a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel
+++ b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel
@@ -110,6 +110,17 @@ kt_android_library(
     visibility = ["//:oppia_api_visibility"],
 )
 
+kt_android_library(
+    name = "event_type_to_human_readable_name_converter",
+    srcs = [
+        "EventTypeToHumanReadableNameConverter.kt",
+    ],
+    deps = [
+        "//model/src/main/proto:event_logger_java_proto_lite",
+        "//third_party:javax_inject_javax_inject",
+    ],
+)
+
 kt_android_library(
     name = "prod_module",
     srcs = [