diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c324a1a7119..14254a2e264 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,11 +26,11 @@
       android:value="2020-09-01" />
     <activity
       android:name=".app.administratorcontrols.AdministratorControlsActivity"
-      android:label="@string/administrator_controls_title"
+      android:label="@string/administrator_controls_activity_title"
       android:theme="@style/OppiaThemeWithoutActionBar" />
     <activity
       android:name=".app.testing.AdministratorControlsFragmentTestActivity"
-      android:label="@string/administrator_controls_fragment_test_activity_label"
+      android:label="@string/administrator_controls_fragment_test_activity_title"
       android:theme="@style/OppiaThemeWithoutActionBar" />
     <activity
       android:name=".app.testing.SpotlightFragmentTestActivity"
@@ -140,7 +140,7 @@
     <activity android:name=".app.player.state.testing.StateFragmentTestActivity" />
     <activity
       android:name=".app.profile.AddProfileActivity"
-      android:label="@string/add_profile_activity_label"
+      android:label="@string/add_profile_activity_title"
       android:theme="@style/OppiaThemeWithoutActionBarColorAccentColorPrimary" />
     <activity
       android:name=".app.profile.AdminAuthActivity"
@@ -159,7 +159,7 @@
       android:windowSoftInputMode="adjustResize" />
     <activity
       android:name=".app.profile.ProfileChooserActivity"
-      android:label="@string/profile_chooser_activity_label"
+      android:label="@string/profile_chooser_activity_title"
       android:theme="@style/OppiaThemeWithoutActionBar" />
     <activity
       android:name=".app.profileprogress.ProfilePictureActivity"
@@ -233,7 +233,7 @@
       android:theme="@style/OppiaThemeWithoutActionBar" />
     <activity
       android:name=".app.testing.ProfileEditFragmentTestActivity"
-      android:label="@string/profile_edit_fragment_test_activity_label"
+      android:label="@string/profile_edit_fragment_test_activity_title"
       android:theme="@style/OppiaThemeWithoutActionBar" />
     <activity android:name=".app.testing.StateAssemblerMarginBindingAdaptersTestActivity" />
     <activity android:name=".app.testing.StateAssemblerPaddingBindingAdaptersTestActivity" />
@@ -257,7 +257,7 @@
     <activity android:name=".app.testing.SplashTestActivity" />
     <activity
       android:name=".app.topic.TopicActivity"
-      android:label="@string/topic_page"
+      android:label="@string/topic_activity_title"
       android:theme="@style/OppiaThemeWithoutActionBar" />
     <activity
       android:name=".app.walkthrough.WalkthroughActivity"
diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt
index 74e0f97ae89..c77b62d8989 100644
--- a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivity.kt
@@ -85,7 +85,7 @@ class AdministratorControlsActivity :
       selectedProfileId,
       isProfileDeletionDialogVisible
     )
-    title = resourceHandler.getStringInLocale(R.string.administrator_controls)
+    title = resourceHandler.getStringInLocale(R.string.administrator_controls_activity_title)
   }
 
   override fun routeToAppVersion() {
@@ -146,7 +146,9 @@ class AdministratorControlsActivity :
     lastLoadedFragment = PROFILE_LIST_FRAGMENT
     administratorControlsActivityPresenter
       .setExtraControlsTitle(
-        resourceHandler.getStringInLocale(R.string.administrator_controls_edit_profiles)
+        resourceHandler.getStringInLocale(
+          R.string.administrator_controls_fragment_edit_profiles_text
+        )
       )
     administratorControlsActivityPresenter.loadProfileList()
   }
@@ -155,7 +157,7 @@ class AdministratorControlsActivity :
     lastLoadedFragment = APP_VERSION_FRAGMENT
     administratorControlsActivityPresenter
       .setExtraControlsTitle(
-        resourceHandler.getStringInLocale(R.string.administrator_controls_app_version)
+        resourceHandler.getStringInLocale(R.string.administrator_controls_fragment_app_version_text)
       )
     administratorControlsActivityPresenter.loadAppVersion()
   }
diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityPresenter.kt
index 0dfe9b50b9c..be6c8f5a16a 100644
--- a/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityPresenter.kt
@@ -187,7 +187,9 @@ class AdministratorControlsActivityPresenter @Inject constructor(
     when (currentFragment) {
       is ProfileEditFragment -> {
         setExtraControlsTitle(
-          resourceHandler.getStringInLocale(R.string.administrator_controls_edit_profiles)
+          resourceHandler.getStringInLocale(
+            R.string.administrator_controls_fragment_edit_profiles_text
+          )
         )
         loadProfileList()
       }
diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/LogoutDialogFragment.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/LogoutDialogFragment.kt
index f53e3244ee3..7182ae898a1 100644
--- a/app/src/main/java/org/oppia/android/app/administratorcontrols/LogoutDialogFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/LogoutDialogFragment.kt
@@ -30,11 +30,11 @@ class LogoutDialogFragment : InjectableDialogFragment() {
 
   override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
     return AlertDialog.Builder(requireContext(), R.style.OppiaAlertDialogTheme)
-      .setMessage(R.string.log_out_dialog_message)
-      .setNegativeButton(R.string.log_out_dialog_cancel_button) { dialog, _ ->
+      .setMessage(R.string.log_out_dialog_message_text)
+      .setNegativeButton(R.string.log_out_dialog_cancel_button_text) { dialog, _ ->
         dialog.dismiss()
       }
-      .setPositiveButton(R.string.log_out_dialog_okay_button) { _, _ ->
+      .setPositiveButton(R.string.log_out_dialog_okay_button_text) { _, _ ->
         val intent = ProfileChooserActivity.createProfileChooserActivity(activity!!)
         startActivity(intent)
       }.create()
diff --git a/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionViewModel.kt b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionViewModel.kt
index f67614fd3be..7595588d92c 100644
--- a/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/administratorcontrols/appversion/AppVersionViewModel.kt
@@ -22,12 +22,14 @@ class AppVersionViewModel @Inject constructor(
 
   /** Returns a localized, human-readable app version name. */
   fun computeVersionNameText(): String =
-    resourceHandler.getStringInLocaleWithWrapping(R.string.app_version_name, versionName)
+    resourceHandler.getStringInLocaleWithWrapping(
+      R.string.app_version_fragment_version_name_text, versionName
+    )
 
   /** Returns a localized, human-readable lastUpdateDateTime. */
   fun computeLastUpdatedDateText(): String =
     resourceHandler.getStringInLocaleWithWrapping(
-      R.string.app_last_update_date, getDateTime(lastUpdateDateTime)
+      R.string.app_version_fragment_last_update_date_text, getDateTime(lastUpdateDateTime)
     )
 
   private fun getDateTime(lastUpdateTime: Long): String =
diff --git a/app/src/main/java/org/oppia/android/app/customview/ChapterNotStartedContainerConstraintLayout.kt b/app/src/main/java/org/oppia/android/app/customview/ChapterNotStartedContainerConstraintLayout.kt
index b20920c763a..6d0b923ff0a 100644
--- a/app/src/main/java/org/oppia/android/app/customview/ChapterNotStartedContainerConstraintLayout.kt
+++ b/app/src/main/java/org/oppia/android/app/customview/ChapterNotStartedContainerConstraintLayout.kt
@@ -56,7 +56,7 @@ class ChapterNotStartedContainerConstraintLayout @JvmOverloads constructor(
       isSpotlit = true
       val spotlightTarget = SpotlightTarget(
         this,
-        resourceHandler.getStringInLocale(R.string.first_chapter_spotlight_hint),
+        resourceHandler.getStringInLocale(R.string.topic_fragment_first_chapter_spotlight_hint),
         feature = Spotlight.FeatureCase.FIRST_CHAPTER
       )
       if (index == 0) {
diff --git a/app/src/main/java/org/oppia/android/app/customview/PromotedStoryCardView.kt b/app/src/main/java/org/oppia/android/app/customview/PromotedStoryCardView.kt
index ca104409df7..6b8c2e7ab07 100644
--- a/app/src/main/java/org/oppia/android/app/customview/PromotedStoryCardView.kt
+++ b/app/src/main/java/org/oppia/android/app/customview/PromotedStoryCardView.kt
@@ -37,7 +37,7 @@ class PromotedStoryCardView @JvmOverloads constructor(
       isSpotlit = true
       val spotlightTarget = SpotlightTarget(
         this,
-        resourceHandler.getStringInLocale(R.string.promoted_story_spotlight_hint),
+        resourceHandler.getStringInLocale(R.string.home_story_promoted_story_spotlight_hint),
         feature = Spotlight.FeatureCase.PROMOTED_STORIES
       )
       checkNotNull(getSpotlightManager()).requestSpotlightViewWithDelayedLayout(spotlightTarget)
diff --git a/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java b/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java
index 591e8c88738..6aff3d8e5c1 100644
--- a/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java
+++ b/app/src/main/java/org/oppia/android/app/databinding/TextViewBindingAdapters.java
@@ -25,7 +25,7 @@ public static void setProfileDataText(@NonNull TextView textView, long timestamp
     AppLanguageResourceHandler resourceHandler = getResourceHandler(textView);
     String time = resourceHandler.computeDateString(timestamp);
     textView.setText(resourceHandler.getStringInLocaleWithWrapping(
-        R.string.profile_edit_created,
+        R.string.profile_edit_activity_created_text,
         time
     ));
   }
@@ -34,7 +34,9 @@ public static void setProfileDataText(@NonNull TextView textView, long timestamp
   @BindingAdapter("profile:lastVisited")
   public static void setProfileLastVisitedText(@NonNull TextView textView, long timestamp) {
     AppLanguageResourceHandler resourceHandler = getResourceHandler(textView);
-    String profileLastUsed = resourceHandler.getStringInLocale(R.string.profile_last_used);
+    String profileLastUsed = resourceHandler.getStringInLocale(
+        R.string.profile_edit_activity_last_used_text
+    );
     String timeAgoTimeStamp = getTimeAgo(textView, timestamp);
     String profileLastVisited = resourceHandler.getStringInLocaleWithWrapping(
         R.string.profile_last_visited,
diff --git a/app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt b/app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt
index 7900163e9a5..4276230d6eb 100644
--- a/app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt
@@ -66,10 +66,10 @@ class ExitProfileDialogFragment : InjectableDialogFragment() {
     val alertDialog = AlertDialog
       .Builder(ContextThemeWrapper(activity as Context, R.style.OppiaAlertDialogTheme))
       .setMessage(R.string.home_activity_back_dialog_message)
-      .setNegativeButton(R.string.home_activity_back_dialog_cancel) { dialog, _ ->
+      .setNegativeButton(R.string.home_activity_back_dialog_cancel_button) { dialog, _ ->
         dialog.dismiss()
       }
-      .setPositiveButton(R.string.home_activity_back_dialog_exit) { _, _ ->
+      .setPositiveButton(R.string.home_activity_back_dialog_exit_button) { _, _ ->
         // TODO(#3641): Investigate on using finish instead of intent.
         val intent = ProfileChooserActivity.createProfileChooserActivity(activity!!)
         if (!restoreLastCheckedItem) {
diff --git a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt
index 44fb2ec9945..36f176e73be 100644
--- a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerFragmentPresenter.kt
@@ -412,8 +412,8 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
         fragment.activity,
         drawerLayout,
         toolbar,
-        R.string.drawer_open_content_description,
-        R.string.drawer_close_content_description
+        R.string.navigation_drawer_fragment_open_content_description,
+        R.string.navigation_drawer_fragment_close_content_description
       ) {
         override fun onDrawerOpened(drawerView: View) {
           super.onDrawerOpened(drawerView)
@@ -451,8 +451,8 @@ class NavigationDrawerFragmentPresenter @Inject constructor(
         fragment.activity,
         drawerLayout,
         toolbar,
-        R.string.drawer_open_content_description,
-        R.string.drawer_close_content_description
+        R.string.navigation_drawer_fragment_open_content_description,
+        R.string.navigation_drawer_fragment_close_content_description
       ) {
         override fun onDrawerOpened(drawerView: View) {
           super.onDrawerOpened(drawerView)
diff --git a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerHeaderViewModel.kt b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerHeaderViewModel.kt
index d75c0d03287..6652defe7c2 100644
--- a/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerHeaderViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/drawer/NavigationDrawerHeaderViewModel.kt
@@ -49,7 +49,9 @@ class NavigationDrawerHeaderViewModel @Inject constructor(
     )
   }
 
-  fun getBarSeparator() = resourceHandler.getStringInLocale(R.string.bar_separator)
+  fun getBarSeparator() = resourceHandler.getStringInLocale(
+    R.string.navigation_drawer_fragment_bar_separator_text
+  )
 
   private fun computeProfileTopicProgressText(): String {
     return resourceHandler.getQuantityStringInLocaleWithWrapping(
diff --git a/app/src/main/java/org/oppia/android/app/help/HelpActivity.kt b/app/src/main/java/org/oppia/android/app/help/HelpActivity.kt
index 8d1182d5105..f92de92c60e 100644
--- a/app/src/main/java/org/oppia/android/app/help/HelpActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/help/HelpActivity.kt
@@ -82,7 +82,7 @@ class HelpActivity :
       selectedLicenseIndex,
       policiesActivityParams
     )
-    title = resourceHandler.getStringInLocale(R.string.menu_help)
+    title = resourceHandler.getStringInLocale(R.string.menu_help_text)
   }
 
   companion object {
diff --git a/app/src/main/java/org/oppia/android/app/help/HelpActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/help/HelpActivityPresenter.kt
index 29f2aa8123b..690f6c39ec7 100644
--- a/app/src/main/java/org/oppia/android/app/help/HelpActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/help/HelpActivityPresenter.kt
@@ -281,7 +281,7 @@ class HelpActivityPresenter @Inject constructor(
     when (fragmentTag) {
       LICENSE_LIST_FRAGMENT_TAG -> {
         val thirdPartyDependenciesList = resourceHandler.getStringInLocale(
-          R.string.help_activity_third_party_dependencies_list
+          R.string.help_activity_third_party_dependencies_text
         )
         activity.findViewById<ImageButton>(R.id.help_multipane_options_back_button)
           .contentDescription = resourceHandler.getStringInLocaleWithoutWrapping(
@@ -291,7 +291,7 @@ class HelpActivityPresenter @Inject constructor(
       }
       LICENSE_TEXT_FRAGMENT_TAG -> {
         val copyrightLicensesList = resourceHandler.getStringInLocale(
-          R.string.help_activity_copyright_licenses_list
+          R.string.help_activity_copyright_licenses_text
         )
         activity.findViewById<ImageButton>(R.id.help_multipane_options_back_button)
           .contentDescription = resourceHandler.getStringInLocaleWithoutWrapping(
@@ -337,10 +337,10 @@ class HelpActivityPresenter @Inject constructor(
   private fun selectPoliciesFragment(policyPage: PolicyPage) {
     when (policyPage) {
       PolicyPage.PRIVACY_POLICY -> setMultipaneContainerTitle(
-        resourceHandler.getStringInLocale(R.string.privacy_policy_title)
+        resourceHandler.getStringInLocale(R.string.policy_activity_privacy_policy_title)
       )
       PolicyPage.TERMS_OF_SERVICE -> setMultipaneContainerTitle(
-        resourceHandler.getStringInLocale(R.string.terms_of_service_title)
+        resourceHandler.getStringInLocale(R.string.policy_activity_terms_of_service_title)
       )
       else -> { }
     }
diff --git a/app/src/main/java/org/oppia/android/app/help/HelpItemViewModel.kt b/app/src/main/java/org/oppia/android/app/help/HelpItemViewModel.kt
index a2472a4e3e1..04375e62bda 100644
--- a/app/src/main/java/org/oppia/android/app/help/HelpItemViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/help/HelpItemViewModel.kt
@@ -16,7 +16,7 @@ class HelpItemViewModel(
 ) : ObservableViewModel() {
   fun onClick(title: String) {
     when (title) {
-      resourceHandler.getStringInLocale(R.string.frequently_asked_questions_FAQ) -> {
+      resourceHandler.getStringInLocale(R.string.help_activity_faq_text) -> {
         if (isMultipane) {
           val loadFaqListFragmentListener = activity as LoadFaqListFragmentListener
           loadFaqListFragmentListener.loadFaqListFragment()
@@ -36,10 +36,10 @@ class HelpItemViewModel(
           routeToThirdPartyDependencyListListener.onRouteToThirdPartyDependencyList()
         }
       }
-      resourceHandler.getStringInLocale(R.string.privacy_policy_title) -> {
+      resourceHandler.getStringInLocale(R.string.policy_activity_privacy_policy_title) -> {
         loadPolicyPage(PolicyPage.PRIVACY_POLICY)
       }
-      resourceHandler.getStringInLocale(R.string.terms_of_service_title) -> {
+      resourceHandler.getStringInLocale(R.string.policy_activity_terms_of_service_title) -> {
         loadPolicyPage(PolicyPage.TERMS_OF_SERVICE)
       }
     }
diff --git a/app/src/main/java/org/oppia/android/app/help/HelpListViewModel.kt b/app/src/main/java/org/oppia/android/app/help/HelpListViewModel.kt
index 3684a6b4e29..833c9a42c84 100644
--- a/app/src/main/java/org/oppia/android/app/help/HelpListViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/help/HelpListViewModel.kt
@@ -19,15 +19,15 @@ class HelpListViewModel @Inject constructor(
   private fun getRecyclerViewItemList(): ArrayList<HelpItemViewModel> {
     for (item in HelpItems.values()) {
       val category = when (item) {
-        HelpItems.FAQ -> resourceHandler.getStringInLocale(R.string.frequently_asked_questions_FAQ)
+        HelpItems.FAQ -> resourceHandler.getStringInLocale(R.string.help_activity_faq_text)
         HelpItems.THIRD_PARTY -> resourceHandler.getStringInLocale(
           R.string.third_party_dependency_list_activity_title
         )
         HelpItems.PRIVACY_POLICY -> resourceHandler.getStringInLocale(
-          R.string.privacy_policy_title
+          R.string.policy_activity_privacy_policy_title
         )
         HelpItems.TERMS_OF_SERVICE -> resourceHandler.getStringInLocale(
-          R.string.terms_of_service_title
+          R.string.policy_activity_terms_of_service_title
         )
       }
       arrayList += HelpItemViewModel(
diff --git a/app/src/main/java/org/oppia/android/app/help/faq/FAQListActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/help/faq/FAQListActivityPresenter.kt
index ed02ae5770d..f73ff2a45ab 100644
--- a/app/src/main/java/org/oppia/android/app/help/faq/FAQListActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/help/faq/FAQListActivityPresenter.kt
@@ -26,7 +26,9 @@ class FAQListActivityPresenter @Inject constructor(
 
     faqListActivityToolbar = binding.faqListActivityToolbar
     activity.setSupportActionBar(faqListActivityToolbar)
-    activity.supportActionBar!!.title = resourceHandler.getStringInLocale(R.string.FAQs)
+    activity.supportActionBar!!.title = resourceHandler.getStringInLocale(
+      R.string.faq_list_activity_title
+    )
     activity.supportActionBar!!.setDisplayShowHomeEnabled(true)
     activity.supportActionBar!!.setDisplayHomeAsUpEnabled(true)
 
diff --git a/app/src/main/java/org/oppia/android/app/help/faq/faqsingle/FAQSingleActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/help/faq/faqsingle/FAQSingleActivityPresenter.kt
index 4802913476e..bd36f117c63 100644
--- a/app/src/main/java/org/oppia/android/app/help/faq/faqsingle/FAQSingleActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/help/faq/faqsingle/FAQSingleActivityPresenter.kt
@@ -34,7 +34,9 @@ class FAQSingleActivityPresenter @Inject constructor(
 
     faqSingleActivityToolbar = binding.faqSingleActivityToolbar
     activity.setSupportActionBar(faqSingleActivityToolbar)
-    activity.supportActionBar!!.title = resourceHandler.getStringInLocale(R.string.FAQs)
+    activity.supportActionBar!!.title = resourceHandler.getStringInLocale(
+      R.string.faq_list_activity_title
+    )
     activity.supportActionBar!!.setDisplayShowHomeEnabled(true)
     activity.supportActionBar!!.setDisplayHomeAsUpEnabled(true)
 
diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
index 670afb8c3c5..ea22690af8c 100644
--- a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionDialogFragmentPresenter.kt
@@ -92,7 +92,7 @@ class HintsAndSolutionDialogFragmentPresenter @Inject constructor(
       HintsAndSolutionFragmentBinding.inflate(inflater, container, /* attachToRoot= */ false)
     binding.hintsAndSolutionToolbar.setNavigationIcon(R.drawable.ic_close_white_24dp)
     binding.hintsAndSolutionToolbar.setNavigationContentDescription(
-      R.string.hints_and_solution_close_icon_description
+      R.string.hint_solution_dialog_close_icon_description
     )
     binding.hintsAndSolutionToolbar.setNavigationOnClickListener {
       (fragment.requireActivity() as? HintsAndSolutionListener)?.dismiss()
diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionViewModel.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionViewModel.kt
index f604f7f6547..2e5f3faaf61 100644
--- a/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/HintsAndSolutionViewModel.kt
@@ -69,7 +69,7 @@ class HintsAndSolutionViewModel private constructor(
   ): HintViewModel {
     return HintViewModel(
       title = resourceHandler.getStringInLocaleWithWrapping(
-        R.string.hint_list_item_number,
+        R.string.hint_solution_dialog_hint_list_item_number,
         resourceHandler.toHumanReadableString(hintIndex + 1)
       ),
       hintSummary = translationController.extractString(
diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/RevealSolutionDialogFragment.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/RevealSolutionDialogFragment.kt
index 384213caf6d..96f010184df 100755
--- a/app/src/main/java/org/oppia/android/app/hintsandsolution/RevealSolutionDialogFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/RevealSolutionDialogFragment.kt
@@ -42,14 +42,22 @@ class RevealSolutionDialogFragment : InjectableDialogFragment() {
 
     return AlertDialog
       .Builder(ContextThemeWrapper(activity as Context, R.style.OppiaDialogFragmentTheme))
-      .setTitle(R.string.reveal_solution)
+      .setTitle(R.string.hint_solution_dialog_reveal_solution_text)
       .setView(view)
-      .setMessage(resourceHandler.getStringInLocale(R.string.this_will_reveal_the_solution))
-      .setPositiveButton(resourceHandler.getStringInLocale(R.string.reveal)) { _, _ ->
+      .setMessage(
+        resourceHandler.getStringInLocale(
+          R.string.hint_solution_dialog_reveal_dialog_solution_text
+        )
+      )
+      .setPositiveButton(
+        resourceHandler.getStringInLocale(
+          R.string.hint_solution_dialog_reveal_dialog_button_text
+        )
+      ) { _, _ ->
         revealSolutionInterface.revealSolution()
         dismiss()
       }
-      .setNegativeButton(R.string.cellular_data_alert_dialog_cancel_button) { _, _ ->
+      .setNegativeButton(R.string.cellular_audio_dialog_cancel_button_text) { _, _ ->
         dismiss()
       }
       .create()
diff --git a/app/src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt b/app/src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt
index cd70ceaae8e..2059b14b3f7 100644
--- a/app/src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/hintsandsolution/SolutionViewModel.kt
@@ -78,8 +78,8 @@ class SolutionViewModel private constructor(
   val correctAnswerContentDescription: String by lazy { computeCorrectAnswerContentDescription() }
 
   private val correctAnswerTextStringResId = if (isSolutionExclusive) {
-    R.string.hints_list_exclusive_solution_text
-  } else R.string.hints_list_possible_solution_text
+    R.string.hint_solution_dialog_exclusive_solution_text
+  } else R.string.hint_solution_dialog_possible_solution_text
 
   private fun computeCorrectAnswerHtml(): String {
     val answerTextHtml = when (correctAnswer.objectTypeCase) {
diff --git a/app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModel.kt b/app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModel.kt
index 993212cdf41..906ef3b164d 100644
--- a/app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/home/promotedlist/PromotedStoryListViewModel.kt
@@ -41,10 +41,10 @@ class PromotedStoryListViewModel(
             resourceHandler.getStringInLocale(R.string.stories_for_you)
         }
         recentlyPlayedStoryList.isNotEmpty() -> {
-          resourceHandler.getStringInLocale(R.string.recently_played_stories)
+          resourceHandler.getStringInLocale(R.string.home_activity_recently_played_stories)
         }
         else -> {
-          resourceHandler.getStringInLocale(R.string.last_played_stories)
+          resourceHandler.getStringInLocale(R.string.home_activity_last_played_stories)
         }
       }
     }
diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/PromotedStoryViewModel.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/PromotedStoryViewModel.kt
index f93fba2613c..06b60075c61 100755
--- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/PromotedStoryViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/PromotedStoryViewModel.kt
@@ -131,7 +131,7 @@ class PromotedStoryViewModel(
    */
   fun computeLessonThumbnailContentDescription(): String {
     return resourceHandler.getStringInLocaleWithWrapping(
-      R.string.lesson_thumbnail_content_description, nextChapterTitle
+      R.string.home_activity_lesson_thumbnail_description, nextChapterTitle
     )
   }
 }
diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt
index 9eef029e29b..a7b3afb5192 100644
--- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedActivityPresenter.kt
@@ -50,13 +50,13 @@ class RecentlyPlayedActivityPresenter @Inject constructor(
         resourceHandler.getStringInLocale(R.string.stories_for_you)
       }
       RecentlyPlayedActivityTitle.LAST_PLAYED_STORIES -> {
-        resourceHandler.getStringInLocale(R.string.last_played_stories)
+        resourceHandler.getStringInLocale(R.string.home_activity_last_played_stories)
       }
       RecentlyPlayedActivityTitle.RECOMMENDED_STORIES -> {
         resourceHandler.getStringInLocale(R.string.recommended_stories)
       }
       else -> {
-        resourceHandler.getStringInLocale(R.string.recently_played_activity)
+        resourceHandler.getStringInLocale(R.string.recently_played_activity_title)
       }
     }
   }
diff --git a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedViewModel.kt b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedViewModel.kt
index 7716fdf11f5..c2bf98155ae 100644
--- a/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/home/recentlyplayed/RecentlyPlayedViewModel.kt
@@ -112,7 +112,7 @@ class RecentlyPlayedViewModel private constructor(
   ) {
     val recentSectionTitleViewModel =
       SectionTitleViewModel(
-        resourceHandler.getStringInLocale(R.string.ongoing_story_last_week), false
+        resourceHandler.getStringInLocale(R.string.home_activity_ongoing_story_last_week), false
       )
     itemList.add(recentSectionTitleViewModel)
     recentlyPlayedStoryList.forEachIndexed { index, promotedStory ->
@@ -128,7 +128,7 @@ class RecentlyPlayedViewModel private constructor(
     val showDivider = itemList.isNotEmpty()
     val olderSectionTitleViewModel =
       SectionTitleViewModel(
-        resourceHandler.getStringInLocale(R.string.ongoing_story_last_month),
+        resourceHandler.getStringInLocale(R.string.home_activity_ongoing_story_last_month),
         showDivider
       )
     itemList.add(olderSectionTitleViewModel)
diff --git a/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentPresenter.kt
index acad9aa15d5..831d9ec3478 100644
--- a/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentPresenter.kt
@@ -46,8 +46,12 @@ class MyDownloadsFragmentPresenter @Inject constructor(
 
     TabLayoutMediator(tabLayout, viewPager2) { tab, position ->
       when (position) {
-        0 -> tab.text = resourceHandler.getStringInLocale(R.string.tab_downloads)
-        1 -> tab.text = resourceHandler.getStringInLocale(R.string.tab_updates)
+        0 -> tab.text = resourceHandler.getStringInLocale(
+          R.string.my_downloads_fragment_tab_download_text
+        )
+        1 ->
+          tab.text =
+            resourceHandler.getStringInLocale(R.string.my_downloads_fragment_tab_updates_text)
       }
     }.attach()
   }
diff --git a/app/src/main/java/org/oppia/android/app/onboarding/OnboadingSlideViewModel.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboadingSlideViewModel.kt
index 83b02f89172..0d03cf11914 100644
--- a/app/src/main/java/org/oppia/android/app/onboarding/OnboadingSlideViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/onboarding/OnboadingSlideViewModel.kt
@@ -20,7 +20,11 @@ class OnboardingSlideViewModel(
   val title =
     ObservableField(getOnboardingSlide0Title())
   val description =
-    ObservableField(resourceHandler.getStringInLocale(R.string.onboarding_slide_0_description))
+    ObservableField(
+      resourceHandler.getStringInLocale(
+        R.string.onboarding_activity_slide_0_description
+      )
+    )
   private val orientation = Resources.getSystem().configuration.orientation
 
   init {
@@ -40,7 +44,11 @@ class OnboardingSlideViewModel(
           slideImage.set(R.drawable.ic_portrait_onboarding_0)
         }
         title.set(getOnboardingSlide0Title())
-        description.set(resourceHandler.getStringInLocale(R.string.onboarding_slide_0_description))
+        description.set(
+          resourceHandler.getStringInLocale(
+            R.string.onboarding_activity_slide_0_description
+          )
+        )
       }
       ViewPagerSlide.SLIDE_1 -> {
         if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
@@ -52,8 +60,16 @@ class OnboardingSlideViewModel(
         } else if (orientation == Configuration.ORIENTATION_PORTRAIT) {
           slideImage.set(R.drawable.ic_portrait_onboarding_1)
         }
-        title.set(resourceHandler.getStringInLocale(R.string.onboarding_slide_1_title))
-        description.set(resourceHandler.getStringInLocale(R.string.onboarding_slide_1_description))
+        title.set(
+          resourceHandler.getStringInLocale(
+            R.string.onboarding_activity_slide_1_title
+          )
+        )
+        description.set(
+          resourceHandler.getStringInLocale(
+            R.string.onboarding_activity_slide_1_description
+          )
+        )
       }
       ViewPagerSlide.SLIDE_2 -> {
         if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
@@ -65,14 +81,25 @@ class OnboardingSlideViewModel(
         } else if (orientation == Configuration.ORIENTATION_PORTRAIT) {
           slideImage.set(R.drawable.ic_portrait_onboarding_2)
         }
-        title.set(resourceHandler.getStringInLocale(R.string.onboarding_slide_2_title))
-        description.set(resourceHandler.getStringInLocale(R.string.onboarding_slide_2_description))
+        title.set(
+          resourceHandler.getStringInLocale(
+            R.string.onboarding_activity_slide_2_title
+          )
+        )
+        description.set(
+          resourceHandler.getStringInLocale(
+            R.string.onboarding_activity_slide_2_description
+          )
+        )
       }
     }
   }
 
   private fun getOnboardingSlide0Title(): String {
     val appName = resourceHandler.getStringInLocale(R.string.app_name)
-    return resourceHandler.getStringInLocaleWithWrapping(R.string.onboarding_slide_0_title, appName)
+    return resourceHandler.getStringInLocaleWithWrapping(
+      R.string.onboarding_activity_slide_0_title,
+      appName
+    )
   }
 }
diff --git a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragmentPresenter.kt
index 1551e6c4199..efe15a02638 100644
--- a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragmentPresenter.kt
@@ -131,7 +131,7 @@ class OnboardingFragmentPresenter @Inject constructor(
 
     val completeString: String =
       resourceHandler.getStringInLocaleWithWrapping(
-        R.string.agree_to_terms,
+        R.string.policy_activity_agree_to_terms_text,
         resourceHandler.getStringInLocale(R.string.app_name)
       )
     binding.slideTermsOfServiceAndPrivacyPolicyLinksTextView.text = htmlParserFactory.create(
diff --git a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingViewModel.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingViewModel.kt
index f7f80e412cb..f4d5bc5aa76 100644
--- a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingViewModel.kt
@@ -27,7 +27,7 @@ class OnboardingViewModel @Inject constructor(
 
   private fun computeSlideDotsContainerContentDescription(slideNumber: Int): String {
     return resourceHandler.getStringInLocaleWithWrapping(
-      R.string.onboarding_slide_dots_content_description,
+      R.string.onboarding_activity_slide_dots_content_description,
       (slideNumber + 1).toString(),
       totalNumberOfSlides.toString()
     )
diff --git a/app/src/main/java/org/oppia/android/app/options/OptionsActivity.kt b/app/src/main/java/org/oppia/android/app/options/OptionsActivity.kt
index 50484e5ff1e..adac20e31c2 100644
--- a/app/src/main/java/org/oppia/android/app/options/OptionsActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/options/OptionsActivity.kt
@@ -94,7 +94,7 @@ class OptionsActivity :
       selectedFragment,
       profileId!!
     )
-    title = resourceHandler.getStringInLocale(R.string.menu_options)
+    title = resourceHandler.getStringInLocale(R.string.menu_options_text)
   }
 
   override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -146,7 +146,7 @@ class OptionsActivity :
   override fun loadReadingTextSizeFragment(textSize: ReadingTextSize) {
     selectedFragment = READING_TEXT_SIZE_FRAGMENT
     optionActivityPresenter.setExtraOptionTitle(
-      resourceHandler.getStringInLocale(R.string.reading_text_size)
+      resourceHandler.getStringInLocale(R.string.option_activity_reading_text_size)
     )
     optionActivityPresenter.loadReadingTextSizeFragment(textSize)
   }
@@ -154,7 +154,7 @@ class OptionsActivity :
   override fun loadAppLanguageFragment(appLanguage: OppiaLanguage) {
     selectedFragment = APP_LANGUAGE_FRAGMENT
     optionActivityPresenter.setExtraOptionTitle(
-      resourceHandler.getStringInLocale(R.string.app_language)
+      resourceHandler.getStringInLocale(R.string.option_activity_app_language_text)
     )
     optionActivityPresenter.loadAppLanguageFragment(appLanguage)
   }
@@ -162,7 +162,7 @@ class OptionsActivity :
   override fun loadAudioLanguageFragment(audioLanguage: AudioLanguage) {
     selectedFragment = AUDIO_LANGUAGE_FRAGMENT
     optionActivityPresenter.setExtraOptionTitle(
-      resourceHandler.getStringInLocale(R.string.audio_language)
+      resourceHandler.getStringInLocale(R.string.option_activity_audio_language_text)
     )
     optionActivityPresenter.loadAudioLanguageFragment(audioLanguage)
   }
diff --git a/app/src/main/java/org/oppia/android/app/options/OptionsReadingTextSizeViewModel.kt b/app/src/main/java/org/oppia/android/app/options/OptionsReadingTextSizeViewModel.kt
index 626069bec7f..442cfcd62c4 100644
--- a/app/src/main/java/org/oppia/android/app/options/OptionsReadingTextSizeViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/options/OptionsReadingTextSizeViewModel.kt
@@ -16,12 +16,20 @@ class OptionsReadingTextSizeViewModel(
     get() {
       return when (readingTextSize.get()!!) {
         ReadingTextSize.SMALL_TEXT_SIZE ->
-          resourceHandler.getStringInLocale(R.string.reading_text_size_small)
+          resourceHandler.getStringInLocale(
+            R.string.option_activity_reading_text_size_small
+          )
         ReadingTextSize.MEDIUM_TEXT_SIZE ->
-          resourceHandler.getStringInLocale(R.string.reading_text_size_medium)
+          resourceHandler.getStringInLocale(
+            R.string.option_activity_reading_text_size_medium
+          )
         ReadingTextSize.LARGE_TEXT_SIZE ->
-          resourceHandler.getStringInLocale(R.string.reading_text_size_large)
-        else -> resourceHandler.getStringInLocale(R.string.reading_text_size_extra_large)
+          resourceHandler.getStringInLocale(
+            R.string.option_activity_reading_text_size_large
+          )
+        else -> resourceHandler.getStringInLocale(
+          R.string.option_activity_reading_text_size_extra_large
+        )
       }
     }
 
diff --git a/app/src/main/java/org/oppia/android/app/options/TextSizeItemViewModel.kt b/app/src/main/java/org/oppia/android/app/options/TextSizeItemViewModel.kt
index 1b3fda584af..3f57aa2abde 100644
--- a/app/src/main/java/org/oppia/android/app/options/TextSizeItemViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/options/TextSizeItemViewModel.kt
@@ -27,12 +27,20 @@ class TextSizeItemViewModel(
   val textSizeName: String by lazy {
     when (readingTextSize) {
       ReadingTextSize.SMALL_TEXT_SIZE ->
-        resourceHandler.getStringInLocale(R.string.reading_text_size_small)
+        resourceHandler.getStringInLocale(
+          R.string.option_activity_reading_text_size_small
+        )
       ReadingTextSize.MEDIUM_TEXT_SIZE ->
-        resourceHandler.getStringInLocale(R.string.reading_text_size_medium)
+        resourceHandler.getStringInLocale(
+          R.string.option_activity_reading_text_size_medium
+        )
       ReadingTextSize.LARGE_TEXT_SIZE ->
-        resourceHandler.getStringInLocale(R.string.reading_text_size_large)
-      else -> resourceHandler.getStringInLocale(R.string.reading_text_size_extra_large)
+        resourceHandler.getStringInLocale(
+          R.string.option_activity_reading_text_size_large
+        )
+      else -> resourceHandler.getStringInLocale(
+        R.string.option_activity_reading_text_size_extra_large
+      )
     }
   }
   val textSize: Float by lazy {
diff --git a/app/src/main/java/org/oppia/android/app/player/audio/AudioFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/player/audio/AudioFragmentPresenter.kt
index 02bcc3deb32..b0483d66008 100644
--- a/app/src/main/java/org/oppia/android/app/player/audio/AudioFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/player/audio/AudioFragmentPresenter.kt
@@ -135,7 +135,9 @@ class AudioFragmentPresenter @Inject constructor(
   private fun startSpotlights() {
     val audioLanguageIconSpotlightTarget = SpotlightTarget(
       binding.audioLanguageIcon,
-      resourceHandler.getStringInLocale(R.string.voiceover_language_icon_spotlight_hint),
+      resourceHandler.getStringInLocale(
+        R.string.audio_fragment_voiceover_language_icon_spotlight_hint
+      ),
       SpotlightShape.Circle,
       Spotlight.FeatureCase.VOICEOVER_LANGUAGE_ICON
     )
@@ -335,10 +337,20 @@ class AudioFragmentPresenter @Inject constructor(
 
   private fun showOfflineDialog() {
     AlertDialog.Builder(activity, R.style.OppiaAlertDialogTheme)
-      .setTitle(resourceHandler.getStringInLocale(R.string.audio_dialog_offline_title))
-      .setMessage(resourceHandler.getStringInLocale(R.string.audio_dialog_offline_message))
+      .setTitle(
+        resourceHandler.getStringInLocale(
+          R.string.audio_fragment_offline_dialog_title
+        )
+      )
+      .setMessage(
+        resourceHandler.getStringInLocale(
+          R.string.audio_fragment_offline_dialog_message
+        )
+      )
       .setPositiveButton(
-        resourceHandler.getStringInLocale(R.string.audio_dialog_offline_positive)
+        resourceHandler.getStringInLocale(
+          R.string.audio_fragment_offline_dialog_positive_button_text
+        )
       ) { dialog, _ ->
         dialog.dismiss()
       }.create().show()
diff --git a/app/src/main/java/org/oppia/android/app/player/audio/AudioViewModel.kt b/app/src/main/java/org/oppia/android/app/player/audio/AudioViewModel.kt
index 07037abd873..7ab82bbb427 100644
--- a/app/src/main/java/org/oppia/android/app/player/audio/AudioViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/player/audio/AudioViewModel.kt
@@ -147,7 +147,7 @@ class AudioViewModel @Inject constructor(
 
   fun computeAudioUnavailabilityString(languageName: String): String {
     return resourceHandler.getStringInLocaleWithWrapping(
-      R.string.audio_unavailable_in_selected_language, languageName
+      R.string.audio_fragment_audio_unavailable_text, languageName
     )
   }
 
diff --git a/app/src/main/java/org/oppia/android/app/player/audio/CellularAudioDialogFragment.kt b/app/src/main/java/org/oppia/android/app/player/audio/CellularAudioDialogFragment.kt
index 50a0025a83a..549880c87a6 100755
--- a/app/src/main/java/org/oppia/android/app/player/audio/CellularAudioDialogFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/player/audio/CellularAudioDialogFragment.kt
@@ -39,14 +39,14 @@ class CellularAudioDialogFragment : InjectableDialogFragment() {
 
     return AlertDialog
       .Builder(ContextThemeWrapper(activity as Context, R.style.OppiaDialogFragmentTheme))
-      .setTitle(R.string.cellular_data_alert_dialog_title)
+      .setTitle(R.string.cellular_audio_dialog_title)
       .setView(view)
-      .setMessage(R.string.cellular_data_alert_dialog_description)
-      .setPositiveButton(R.string.cellular_data_alert_dialog_okay_button) { _, _ ->
+      .setMessage(R.string.cellular_audio_dialog_description)
+      .setPositiveButton(R.string.cellular_audio_dialog_okay_button_text) { _, _ ->
         cellularDataInterface.enableAudioWhileOnCellular(checkBox.isChecked)
         dismiss()
       }
-      .setNegativeButton(R.string.cellular_data_alert_dialog_cancel_button) { _, _ ->
+      .setNegativeButton(R.string.cellular_audio_dialog_cancel_button_text) { _, _ ->
         cellularDataInterface.disableAudioWhileOnCellular(checkBox.isChecked)
         dismiss()
       }
diff --git a/app/src/main/java/org/oppia/android/app/player/audio/LanguageDialogFragment.kt b/app/src/main/java/org/oppia/android/app/player/audio/LanguageDialogFragment.kt
index 275705a0ed9..4f1b0927333 100644
--- a/app/src/main/java/org/oppia/android/app/player/audio/LanguageDialogFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/player/audio/LanguageDialogFragment.kt
@@ -85,17 +85,17 @@ class LanguageDialogFragment : InjectableDialogFragment() {
 
     return AlertDialog
       .Builder(ContextThemeWrapper(activity as Context, R.style.OppiaDialogFragmentTheme))
-      .setTitle(R.string.audio_language_select_dialog_title)
+      .setTitle(R.string.audio_language_dialog_title)
       .setSingleChoiceItems(options, selectedIndex) { dialog, which ->
         selectedIndex = which
       }
-      .setPositiveButton(R.string.audio_language_select_dialog_okay_button) { _, _ ->
+      .setPositiveButton(R.string.audio_language_dialog_okay_button_text) { _, _ ->
         if (selectedIndex != -1) {
           languageInterface.onLanguageSelected(languageCodeArrayList[selectedIndex])
         }
         dismiss()
       }
-      .setNegativeButton(R.string.audio_language_select_dialog_cancel_button) { _, _ ->
+      .setNegativeButton(R.string.audio_language_dialog_cancel_button_text) { _, _ ->
         dismiss()
       }
       .create()
diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt
index 3efadb513de..58f49a4c0a7 100644
--- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationActivityPresenter.kt
@@ -164,7 +164,7 @@ class ExplorationActivityPresenter @Inject constructor(
           val audioPlayerSpotlightTarget = SpotlightTarget(
             it,
             resourceHandler.getStringInLocaleWithWrapping(
-              R.string.voiceover_icon_spotlight_hint,
+              R.string.exploration_activity_voiceover_icon_spotlight_hint,
               resourceHandler.getStringInLocale(R.string.app_name)
             ),
             SpotlightShape.Circle,
diff --git a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt
index 8796b96b672..a77c09b0cdb 100755
--- a/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/player/exploration/ExplorationFragmentPresenter.kt
@@ -95,7 +95,9 @@ class ExplorationFragmentPresenter @Inject constructor(
         // This toolbar contains only one image button, which is the back navigation icon.
         val backButtonSpotlightTarget = SpotlightTarget(
           it,
-          resourceHandler.getStringInLocale(R.string.exploration_exit_button_spotlight_hint),
+          resourceHandler.getStringInLocale(
+            R.string.exploration_activity_exit_button_spotlight_hint
+          ),
           SpotlightShape.Circle,
           Spotlight.FeatureCase.LESSONS_BACK_BUTTON
         )
diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragDropInteractionContentViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragDropInteractionContentViewModel.kt
index f0bdcf3ef2f..96c8e986200 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragDropInteractionContentViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/DragDropInteractionContentViewModel.kt
@@ -44,28 +44,34 @@ class DragDropInteractionContentViewModel(
   fun computeDragDropMoveUpItemContentDescription(): String {
     return if (itemIndex != 0) {
       resourceHandler.getStringInLocaleWithWrapping(
-        R.string.move_item_up_content_description, itemIndex.toString()
+        R.string.state_fragment_drag_drop_interaction_move_item_up_content_description,
+        itemIndex.toString()
       )
-    } else resourceHandler.getStringInLocale(R.string.up_button_disabled)
+    } else resourceHandler.getStringInLocale(
+      R.string.state_fragment_drag_drop_interaction_up_button_disabled
+    )
   }
 
   fun computeDragDropMoveDownItemContentDescription(): String {
     return if (itemIndex != listSize - 1) {
       resourceHandler.getStringInLocaleWithWrapping(
-        R.string.move_item_down_content_description, (itemIndex + 2).toString()
+        R.string.state_fragment_drag_drop_interaction_move_item_down_content_description,
+        (itemIndex + 2).toString()
       )
-    } else resourceHandler.getStringInLocale(R.string.down_button_disabled)
+    } else resourceHandler.getStringInLocale(
+      R.string.state_fragment_drag_drop_interaction_down_button_disabled
+    )
   }
 
   fun computeDragDropGroupItemContentDescription(): String {
     return resourceHandler.getStringInLocaleWithWrapping(
-      R.string.link_to_item_below, (itemIndex + 2).toString()
+      R.string.state_fragment_drag_drop_interaction_link_to_item_below, (itemIndex + 2).toString()
     )
   }
 
   fun computeDragDropUnlinkItemContentDescription(): String {
     return resourceHandler.getStringInLocaleWithWrapping(
-      R.string.unlink_items, (itemIndex + 1).toString()
+      R.string.state_fragment_drag_drop_interaction_unlink_items, (itemIndex + 1).toString()
     )
   }
 }
diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/FractionInteractionViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/FractionInteractionViewModel.kt
index 22d42a74744..b1b089f5dd2 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/FractionInteractionViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/FractionInteractionViewModel.kt
@@ -123,8 +123,12 @@ class FractionInteractionViewModel private constructor(
       customPlaceholder1.isNotEmpty() -> customPlaceholder1
       customPlaceholder2.isNotEmpty() -> customPlaceholder2
       !allowNonzeroIntegerPart ->
-        resourceHandler.getStringInLocale(R.string.fractions_default_hint_text_no_integer)
-      else -> resourceHandler.getStringInLocale(R.string.fractions_default_hint_text)
+        resourceHandler.getStringInLocale(
+          R.string.state_fragment_fraction_input_interaction_no_integer_hint
+        )
+      else -> resourceHandler.getStringInLocale(
+        R.string.state_fragment_fraction_input_interaction_hint
+      )
     }
   }
 
diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ImageRegionSelectionInteractionViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ImageRegionSelectionInteractionViewModel.kt
index 0c4029e940e..f0bc8727896 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ImageRegionSelectionInteractionViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/ImageRegionSelectionInteractionViewModel.kt
@@ -76,7 +76,7 @@ class ImageRegionSelectionInteractionViewModel private constructor(
       clickOnImage = parseClickOnImage(answerTextString)
     }.build()
     plainAnswer = resourceHandler.getStringInLocaleWithWrapping(
-      R.string.image_interaction_answer_text,
+      R.string.state_fragment_image_interaction_answer_text,
       answerTextString
     )
     this.writtenTranslationContext =
diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/MathExpressionInteractionsViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/MathExpressionInteractionsViewModel.kt
index 5d0822fae6c..88123b8412b 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/MathExpressionInteractionsViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/MathExpressionInteractionsViewModel.kt
@@ -293,7 +293,7 @@ class MathExpressionInteractionsViewModel private constructor(
       /** Defines the view model behaviors corresponding to numeric expressions. */
       NUMERIC_EXPRESSION(
         ViewType.NUMERIC_EXPRESSION_INPUT_INTERACTION,
-        defaultHintTextStringId = R.string.numeric_expression_default_hint_text,
+        defaultHintTextStringId = R.string.state_fragment_numeric_input_interaction_default_hint,
         hasPlaceholder = true,
         hasCustomVariables = false
       ) {
@@ -332,7 +332,7 @@ class MathExpressionInteractionsViewModel private constructor(
       /** Defines the view model behaviors corresponding to algebraic expressions. */
       ALGEBRAIC_EXPRESSION(
         ViewType.ALGEBRAIC_EXPRESSION_INPUT_INTERACTION,
-        defaultHintTextStringId = R.string.algebraic_expression_default_hint_text,
+        defaultHintTextStringId = R.string.state_fragment_algebraic_input_interaction_default_hint,
         hasPlaceholder = false,
         hasCustomVariables = true
       ) {
@@ -370,7 +370,7 @@ class MathExpressionInteractionsViewModel private constructor(
       /** Defines the view model behaviors corresponding to math equations. */
       MATH_EQUATION(
         ViewType.MATH_EQUATION_INPUT_INTERACTION,
-        defaultHintTextStringId = R.string.math_equation_default_hint_text,
+        defaultHintTextStringId = R.string.state_fragment_math_equation_default_hint,
         hasPlaceholder = false,
         hasCustomVariables = true
       ) {
@@ -418,106 +418,108 @@ class MathExpressionInteractionsViewModel private constructor(
           is MathParsingResult.Failure -> when (val error = parseResult.error) {
             is DisabledVariablesInUseError -> {
               appLanguageResourceHandler.getStringInLocaleWithWrapping(
-                R.string.math_expression_error_invalid_variable,
+                R.string.state_fragment_math_expression_invalid_variable_error,
                 error.variables.joinToString(separator = ", ")
               )
             }
             EquationIsMissingEqualsError -> {
               appLanguageResourceHandler.getStringInLocale(
-                R.string.math_expression_error_missing_equals
+                R.string.state_fragment_math_expression_missing_equals_error
               )
             }
             EquationHasTooManyEqualsError -> {
               appLanguageResourceHandler.getStringInLocale(
-                R.string.math_expression_error_more_than_one_equals
+                R.string.state_fragment_math_expression_more_than_one_equals_error
               )
             }
             EquationMissingLhsOrRhsError -> {
               appLanguageResourceHandler.getStringInLocale(
-                R.string.math_expression_error_hanging_equals
+                R.string.state_fragment_math_expression_hanging_equals_error
               )
             }
             ExponentIsVariableExpressionError -> {
               appLanguageResourceHandler.getStringInLocale(
-                R.string.math_expression_error_exponent_has_variable
+                R.string.state_fragment_math_expression_exponent_has_variable_error
               )
             }
             ExponentTooLargeError -> {
               appLanguageResourceHandler.getStringInLocale(
-                R.string.math_expression_error_exponent_too_large
+                R.string.state_fragment_math_expression_exponent_too_large_error
               )
             }
             FunctionNameIncompleteError -> {
               appLanguageResourceHandler.getStringInLocale(
-                R.string.math_expression_error_incomplete_function_name
+                R.string.state_fragment_math_expression_incomplete_function_name_error
               )
             }
             GenericError -> {
               appLanguageResourceHandler.getStringInLocale(
-                R.string.math_expression_error_generic
+                R.string.state_fragment_math_expression_generic_error
               )
             }
             HangingSquareRootError -> {
               appLanguageResourceHandler.getStringInLocale(
-                R.string.math_expression_error_hanging_square_root
+                R.string.state_fragment_math_expression_hanging_square_root_error
               )
             }
             is InvalidFunctionInUseError -> {
               appLanguageResourceHandler.getStringInLocaleWithWrapping(
-                R.string.math_expression_error_unsupported_function, error.functionName
+                R.string.state_fragment_math_expression_unsupported_function_error,
+                error.functionName
               )
             }
             is MultipleRedundantParenthesesError -> {
               appLanguageResourceHandler.getStringInLocaleWithWrapping(
-                R.string.math_expression_error_multiple_redundant_parentheses, error.rawExpression
+                R.string.state_fragment_math_expression_multiple_redundant_parentheses_error,
+                error.rawExpression
               )
             }
             NestedExponentsError -> {
               appLanguageResourceHandler.getStringInLocale(
-                R.string.math_expression_error_nested_exponent
+                R.string.state_fragment_math_expression_nested_exponent_error
               )
             }
             is NoVariableOrNumberAfterBinaryOperatorError -> when (error.operator) {
               UnaryOperator.ADD -> {
                 appLanguageResourceHandler.getStringInLocaleWithWrapping(
-                  R.string.math_expression_error_missing_rhs_for_addition_operator,
+                  R.string.state_fragment_math_expression_missing_rhs_for_addition_error,
                   error.operatorSymbol
                 )
               }
               UnaryOperator.SUBTRACT -> {
                 appLanguageResourceHandler.getStringInLocaleWithWrapping(
-                  R.string.math_expression_error_missing_rhs_for_subtraction_operator,
+                  R.string.state_fragment_math_expression_missing_rhs_for_subtraction_error,
                   error.operatorSymbol
                 )
               }
               UnaryOperator.MULTIPLY -> {
                 appLanguageResourceHandler.getStringInLocaleWithWrapping(
-                  R.string.math_expression_error_missing_rhs_for_multiplication_operator,
+                  R.string.state_fragment_math_expression_missing_rhs_for_multiplication_error,
                   error.operatorSymbol
                 )
               }
               UnaryOperator.DIVIDE -> {
                 appLanguageResourceHandler.getStringInLocaleWithWrapping(
-                  R.string.math_expression_error_missing_rhs_for_division_operator,
+                  R.string.state_fragment_math_expression_missing_rhs_for_division_error,
                   error.operatorSymbol
                 )
               }
               UnaryOperator.EXPONENTIATE -> {
                 appLanguageResourceHandler.getStringInLocaleWithWrapping(
-                  R.string.math_expression_error_missing_rhs_for_exponentiation_operator,
+                  R.string.state_fragment_math_expression_missing_rhs_for_exponentiation_error,
                   error.operatorSymbol
                 )
               }
               UnaryOperator.OPERATOR_UNSPECIFIED, UnaryOperator.UNRECOGNIZED -> {
                 appLanguageResourceHandler.getStringInLocale(
-                  R.string.math_expression_error_generic
+                  R.string.state_fragment_math_expression_generic_error
                 )
               }
             }
             is NoVariableOrNumberBeforeBinaryOperatorError -> when (error.operator) {
               UnaryOperator.ADD -> {
                 appLanguageResourceHandler.getStringInLocaleWithWrapping(
-                  R.string.math_expression_error_missing_lhs_for_addition_operator,
+                  R.string.state_fragment_math_expression_missing_lhs_for_addition_error,
                   error.operatorSymbol
                 )
               }
@@ -525,81 +527,83 @@ class MathExpressionInteractionsViewModel private constructor(
               UnaryOperator.SUBTRACT -> error("This case should never happen.")
               UnaryOperator.MULTIPLY -> {
                 appLanguageResourceHandler.getStringInLocaleWithWrapping(
-                  R.string.math_expression_error_missing_lhs_for_multiplication_operator,
+                  R.string.state_fragment_math_expression_missing_lhs_for_multiplication_error,
                   error.operatorSymbol
                 )
               }
               UnaryOperator.DIVIDE -> {
                 appLanguageResourceHandler.getStringInLocaleWithWrapping(
-                  R.string.math_expression_error_missing_lhs_for_division_operator,
+                  R.string.state_fragment_math_expression_missing_lhs_for_division_error,
                   error.operatorSymbol
                 )
               }
               UnaryOperator.EXPONENTIATE -> {
                 appLanguageResourceHandler.getStringInLocaleWithWrapping(
-                  R.string.math_expression_error_missing_lhs_for_exponentiation_operator,
+                  R.string.state_fragment_math_expression_missing_lhs_for_exponentiation_error,
                   error.operatorSymbol
                 )
               }
               UnaryOperator.OPERATOR_UNSPECIFIED, UnaryOperator.UNRECOGNIZED -> {
                 appLanguageResourceHandler.getStringInLocale(
-                  R.string.math_expression_error_generic
+                  R.string.state_fragment_math_expression_generic_error
                 )
               }
             }
             is NumberAfterVariableError -> {
               appLanguageResourceHandler.getStringInLocaleWithWrapping(
-                R.string.math_expression_error_number_after_var_term,
+                R.string.state_fragment_math_expression_number_after_var_error,
                 error.variable,
                 error.number.toPlainText()
               )
             }
             is RedundantParenthesesForIndividualTermsError -> {
               appLanguageResourceHandler.getStringInLocaleWithWrapping(
-                R.string.math_expression_error_redundant_parentheses_individual_term,
+                R.string.state_fragment_math_expression_individual_redundant_parentheses_error,
                 error.rawExpression
               )
             }
             is SingleRedundantParenthesesError -> {
               appLanguageResourceHandler.getStringInLocaleWithWrapping(
-                R.string.math_expression_error_single_redundant_parentheses, error.rawExpression
+                R.string.state_fragment_math_expression_single_redundant_parentheses_error,
+                error.rawExpression
               )
             }
             SpacesBetweenNumbersError -> {
               appLanguageResourceHandler.getStringInLocale(
-                R.string.math_expression_error_spaces_in_numerical_input
+                R.string.state_fragment_math_expression_space_error
               )
             }
             is SubsequentBinaryOperatorsError -> {
               appLanguageResourceHandler.getStringInLocaleWithWrapping(
-                R.string.math_expression_error_consecutive_binary_operators,
+                R.string.state_fragment_math_expression_consecutive_binary_operators_error,
                 error.operator1,
                 error.operator2
               )
             }
             is SubsequentUnaryOperatorsError -> {
               appLanguageResourceHandler.getStringInLocale(
-                R.string.math_expression_error_consecutive_unary_operators
+                R.string.state_fragment_math_expression_consecutive_unary_operators_error
               )
             }
             TermDividedByZeroError -> {
               appLanguageResourceHandler.getStringInLocale(
-                R.string.math_expression_error_term_divided_by_zero
+                R.string.state_fragment_math_expression_divided_by_zero_error
               )
             }
             UnbalancedParenthesesError -> {
               appLanguageResourceHandler.getStringInLocale(
-                R.string.math_expression_error_unbalanced_parentheses
+                R.string.state_fragment_math_expression_unbalanced_parentheses_error
               )
             }
             is UnnecessarySymbolsError -> {
               appLanguageResourceHandler.getStringInLocaleWithWrapping(
-                R.string.math_expression_error_unnecessary_symbols, error.invalidSymbol
+                R.string.state_fragment_math_expression_unnecessary_symbols_error,
+                error.invalidSymbol
               )
             }
             VariableInNumericExpressionError -> {
               appLanguageResourceHandler.getStringInLocale(
-                R.string.math_expression_error_variable_in_numeric_expression
+                R.string.state_fragment_math_expression_variable_in_numeric_error
               )
             }
           }
diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/PreviousResponsesHeaderViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/PreviousResponsesHeaderViewModel.kt
index 2fbdb5d1d5e..0bf4707c196 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/PreviousResponsesHeaderViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/PreviousResponsesHeaderViewModel.kt
@@ -20,7 +20,7 @@ class PreviousResponsesHeaderViewModel(
   /** Returns the user-readable header text for previous responses. */
   fun computePreviousResponsesHeaderText(): String {
     return resourceHandler.getStringInLocaleWithWrapping(
-      R.string.previous_responses_header, previousAnswerCount.toString()
+      R.string.state_fragment_previous_responses_header, previousAnswerCount.toString()
     )
   }
 }
diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SubmittedAnswerViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SubmittedAnswerViewModel.kt
index 9e90beb624e..609acecdb59 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SubmittedAnswerViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/SubmittedAnswerViewModel.kt
@@ -54,11 +54,11 @@ class SubmittedAnswerViewModel(
     val answer = if (accessibleAnswer.isNullOrBlank()) submittedAnswer else accessibleAnswer
     return if (isCorrectAnswer) {
       resourceHandler.getStringInLocaleWithWrapping(
-        R.string.correct_submitted_answer_with_append, answer
+        R.string.state_fragment_correct_submitted_answer_with_append, answer
       )
     } else {
       resourceHandler.getStringInLocaleWithWrapping(
-        R.string.incorrect_submitted_answer_with_append, answer
+        R.string.state_fragment_incorrect_submitted_answer_with_append, answer
       )
     }
   }
diff --git a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/TextInputViewModel.kt b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/TextInputViewModel.kt
index b3bdbba2ac0..09d93b66beb 100644
--- a/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/TextInputViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/player/state/itemviewmodel/TextInputViewModel.kt
@@ -90,7 +90,9 @@ class TextInputViewModel private constructor(
     return when {
       placeholder1.isNotEmpty() -> placeholder1
       placeholder2.isNotEmpty() -> placeholder2
-      else -> resourceHandler.getStringInLocale(R.string.text_input_default_hint_text)
+      else -> resourceHandler.getStringInLocale(
+        R.string.state_fragment_text_input_default_hint_text
+      )
     }
   }
 
diff --git a/app/src/main/java/org/oppia/android/app/player/stopplaying/ProgressDatabaseFullDialogFragment.kt b/app/src/main/java/org/oppia/android/app/player/stopplaying/ProgressDatabaseFullDialogFragment.kt
index 02e34e987eb..588ba2217b7 100644
--- a/app/src/main/java/org/oppia/android/app/player/stopplaying/ProgressDatabaseFullDialogFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/player/stopplaying/ProgressDatabaseFullDialogFragment.kt
@@ -62,26 +62,26 @@ class ProgressDatabaseFullDialogFragment : InjectableDialogFragment() {
 
     return AlertDialog
       .Builder(ContextThemeWrapper(activity as Context, R.style.OppiaDialogFragmentTheme))
-      .setTitle(R.string.progress_database_full_dialog_title)
+      .setTitle(R.string.stop_exploration_dialog_progress_full_title)
       .setMessage(
         resourceHandler.getStringInLocaleWithWrapping(
-          R.string.progress_database_full_dialog_description, oldestSavedExplorationTitle
+          R.string.stop_exploration_dialog_progress_full_description, oldestSavedExplorationTitle
         )
       )
-      .setPositiveButton(R.string.progress_database_full_dialog_continue_button) { _, _ ->
+      .setPositiveButton(R.string.stop_exploration_dialog_progress_full_continue_button) { _, _ ->
         stopStatePlayingSessionListenerWithSavedProgressListener
           .deleteOldestProgressAndStopSession()
         dismiss()
       }
       .setNeutralButton(
-        R.string.progress_database_full_dialog_leave_without_saving_progress_button
+        R.string.stop_exploration_dialog_progress_full_without_saving_button
       ) { _, _ ->
         stopStatePlayingSessionListenerWithSavedProgressListener
           .deleteCurrentProgressAndStopSession(isCompletion = false)
         dismiss()
       }
       .setNegativeButton(
-        R.string.progress_database_full_dialog_back_to_lesson_button
+        R.string.stop_exploration_dialog_progress_full_back_to_lesson_button
       ) { _, _ ->
         dismiss()
       }
diff --git a/app/src/main/java/org/oppia/android/app/player/stopplaying/StopExplorationDialogFragment.kt b/app/src/main/java/org/oppia/android/app/player/stopplaying/StopExplorationDialogFragment.kt
index 61e98b2cf59..3a5ec84b328 100644
--- a/app/src/main/java/org/oppia/android/app/player/stopplaying/StopExplorationDialogFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/player/stopplaying/StopExplorationDialogFragment.kt
@@ -39,11 +39,11 @@ class StopExplorationDialogFragment : InjectableDialogFragment() {
       .Builder(ContextThemeWrapper(activity as Context, R.style.OppiaDialogFragmentTheme))
       .setTitle(R.string.stop_exploration_dialog_title)
       .setMessage(R.string.stop_exploration_dialog_description)
-      .setPositiveButton(R.string.stop_exploration_dialog_leave_button) { _, _ ->
+      .setPositiveButton(R.string.stop_exploration_dialog_leave_button_text) { _, _ ->
         stopStatePlayingSessionListener.stopSession()
         dismiss()
       }
-      .setNegativeButton(R.string.stop_exploration_dialog_cancel_button) { _, _ ->
+      .setNegativeButton(R.string.stop_exploration_dialog_cancel_button_text) { _, _ ->
         dismiss()
       }
       .create()
diff --git a/app/src/main/java/org/oppia/android/app/player/stopplaying/UnsavedExplorationDialogFragment.kt b/app/src/main/java/org/oppia/android/app/player/stopplaying/UnsavedExplorationDialogFragment.kt
index 3e0c190c47e..0c7d44d73bb 100644
--- a/app/src/main/java/org/oppia/android/app/player/stopplaying/UnsavedExplorationDialogFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/player/stopplaying/UnsavedExplorationDialogFragment.kt
@@ -39,12 +39,12 @@ class UnsavedExplorationDialogFragment : InjectableDialogFragment() {
       .Builder(ContextThemeWrapper(activity as Context, R.style.OppiaDialogFragmentTheme))
       .setTitle(R.string.unsaved_exploration_dialog_title)
       .setMessage(R.string.unsaved_exploration_dialog_description)
-      .setPositiveButton(R.string.unsaved_exploration_dialog_leave_button) { _, _ ->
+      .setPositiveButton(R.string.unsaved_exploration_dialog_leave_button_text) { _, _ ->
         stopStatePlayingSessionWithSavedProgressListener
           .deleteCurrentProgressAndStopSession(isCompletion = false)
         dismiss()
       }
-      .setNegativeButton(R.string.unsaved_exploration_dialog_cancel_button) { _, _ ->
+      .setNegativeButton(R.string.unsaved_exploration_dialog_cancel_button_text) { _, _ ->
         dismiss()
       }
       .create()
diff --git a/app/src/main/java/org/oppia/android/app/policies/PoliciesActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/policies/PoliciesActivityPresenter.kt
index 917fe24f75a..681355aed90 100644
--- a/app/src/main/java/org/oppia/android/app/policies/PoliciesActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/policies/PoliciesActivityPresenter.kt
@@ -44,9 +44,9 @@ class PoliciesActivityPresenter @Inject constructor(
 
     toolbar.title = when (policyPage) {
       PolicyPage.PRIVACY_POLICY ->
-        resourceHandler.getStringInLocale(R.string.privacy_policy_title)
+        resourceHandler.getStringInLocale(R.string.policy_activity_privacy_policy_title)
       PolicyPage.TERMS_OF_SERVICE ->
-        resourceHandler.getStringInLocale(R.string.terms_of_service_title)
+        resourceHandler.getStringInLocale(R.string.policy_activity_terms_of_service_title)
       PolicyPage.POLICY_PAGE_UNSPECIFIED,
       PolicyPage.UNRECOGNIZED -> ""
     }
diff --git a/app/src/main/java/org/oppia/android/app/policies/PoliciesFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/policies/PoliciesFragmentPresenter.kt
index 4fad16c9462..639008bf0b9 100644
--- a/app/src/main/java/org/oppia/android/app/policies/PoliciesFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/policies/PoliciesFragmentPresenter.kt
@@ -48,11 +48,11 @@ class PoliciesFragmentPresenter @Inject constructor(
     if (policyPage == PolicyPage.PRIVACY_POLICY) {
       policyDescription =
         resourceHandler.getStringInLocale(R.string.privacy_policy_content)
-      policyWebLink = resourceHandler.getStringInLocale(R.string.privacy_policy_web_link)
+      policyWebLink = resourceHandler.getStringInLocale(R.string.policy_activity_privacy_web_link)
     } else if (policyPage == PolicyPage.TERMS_OF_SERVICE) {
       policyDescription =
         resourceHandler.getStringInLocale(R.string.terms_of_service_content)
-      policyWebLink = resourceHandler.getStringInLocale(R.string.terms_of_service_web_link)
+      policyWebLink = resourceHandler.getStringInLocale(R.string.policy_activity_terms_web_link)
     }
 
     binding.policyDescriptionTextView.text = htmlParserFactory.create(
diff --git a/app/src/main/java/org/oppia/android/app/profile/AddProfileActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/AddProfileActivityPresenter.kt
index 75c8cc2e014..316ecf0b2cb 100644
--- a/app/src/main/java/org/oppia/android/app/profile/AddProfileActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/profile/AddProfileActivityPresenter.kt
@@ -79,10 +79,14 @@ class AddProfileActivityPresenter @Inject constructor(
     }
     val toolbar = activity.findViewById<View>(R.id.add_profile_activity_toolbar) as Toolbar
     activity.setSupportActionBar(toolbar)
-    activity.supportActionBar?.title = resourceHandler.getStringInLocale(R.string.add_profile_title)
+    activity.supportActionBar?.title = resourceHandler.getStringInLocale(
+      R.string.add_profile_activity_title
+    )
     activity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
     activity.supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp)
-    activity.supportActionBar?.setHomeActionContentDescription(R.string.admin_auth_close)
+    activity.supportActionBar?.setHomeActionContentDescription(
+      R.string.admin_auth_activity_tool_bar_content_desc
+    )
 
     uploadImageView = binding.addProfileActivityUserImageView
     Glide.with(activity)
@@ -250,7 +254,7 @@ class AddProfileActivityPresenter @Inject constructor(
     if (name.isEmpty()) {
       profileViewModel.nameErrorMsg.set(
         resourceHandler.getStringInLocale(
-          R.string.add_profile_error_name_empty
+          R.string.add_profile_activity_name_empty_error_text
         )
       )
       failed = true
@@ -258,7 +262,7 @@ class AddProfileActivityPresenter @Inject constructor(
     if (pin.isNotEmpty() && pin.length < 3) {
       profileViewModel.pinErrorMsg.set(
         resourceHandler.getStringInLocale(
-          R.string.add_profile_error_pin_length
+          R.string.add_profile_activity_pin_length_error_text
         )
       )
       failed = true
@@ -266,7 +270,7 @@ class AddProfileActivityPresenter @Inject constructor(
     if (pin != confirmPin) {
       profileViewModel.confirmPinErrorMsg.set(
         resourceHandler.getStringInLocale(
-          R.string.add_profile_error_pin_confirm_wrong
+          R.string.add_profile_activity_wrong_confirm_pin_error_text
         )
       )
       failed = true
@@ -289,13 +293,13 @@ class AddProfileActivityPresenter @Inject constructor(
           is ProfileManagementController.ProfileNameNotUniqueException ->
             profileViewModel.nameErrorMsg.set(
               resourceHandler.getStringInLocale(
-                R.string.add_profile_error_name_not_unique
+                R.string.add_profile_activity_name_not_unique_error_text
               )
             )
           is ProfileManagementController.ProfileNameOnlyLettersException ->
             profileViewModel.nameErrorMsg.set(
               resourceHandler.getStringInLocale(
-                R.string.add_profile_error_name_only_letters
+                R.string.add_profile_activity_name_only_letters_error_text
               )
             )
         }
@@ -308,8 +312,8 @@ class AddProfileActivityPresenter @Inject constructor(
   private fun showInfoDialog() {
     profileViewModel.showInfoAlertPopup.set(true)
     alertDialog = AlertDialog.Builder(activity as Context, R.style.OppiaAlertDialogTheme)
-      .setMessage(R.string.add_profile_pin_info)
-      .setPositiveButton(R.string.add_profile_close) { dialog, _ ->
+      .setMessage(R.string.add_profile_activity_pin_info_dialog_text)
+      .setPositiveButton(R.string.add_profile_activity_close_dialog_text) { dialog, _ ->
         profileViewModel.showInfoAlertPopup.set(false)
         dialog.dismiss()
       }
diff --git a/app/src/main/java/org/oppia/android/app/profile/AdminAuthActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/AdminAuthActivityPresenter.kt
index 2651603478d..9c00ce5bda9 100644
--- a/app/src/main/java/org/oppia/android/app/profile/AdminAuthActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/profile/AdminAuthActivityPresenter.kt
@@ -96,7 +96,7 @@ class AdminAuthActivityPresenter @Inject constructor(
         }
       } else if (inputPin.length == adminPin.length) {
         authViewModel.errorMessage.set(
-          resourceHandler.getStringInLocale(R.string.admin_auth_incorrect)
+          resourceHandler.getStringInLocale(R.string.admin_auth_activity_incorrect_pin_label)
         )
       }
     }
@@ -108,21 +108,21 @@ class AdminAuthActivityPresenter @Inject constructor(
         activity.title =
           resourceHandler.getStringInLocale(R.string.admin_auth_activity_access_controls_title)
         binding?.adminAuthToolbar?.title =
-          resourceHandler.getStringInLocale(R.string.administrator_controls)
+          resourceHandler.getStringInLocale(R.string.administrator_controls_activity_title)
         binding?.adminAuthHeadingTextview?.text =
-          resourceHandler.getStringInLocale(R.string.admin_auth_heading)
+          resourceHandler.getStringInLocale(R.string.admin_auth_activity_heading_text)
         binding?.adminAuthSubText?.text =
-          resourceHandler.getStringInLocale(R.string.admin_auth_admin_controls_sub)
+          resourceHandler.getStringInLocale(R.string.admin_auth_activity_controls_subheading_text)
       }
       AdminAuthEnum.PROFILE_ADD_PROFILE.value -> {
         activity.title =
           resourceHandler.getStringInLocale(R.string.admin_auth_activity_add_profiles_title)
         binding?.adminAuthToolbar?.title =
-          resourceHandler.getStringInLocale(R.string.add_profile_title)
+          resourceHandler.getStringInLocale(R.string.add_profile_activity_title)
         binding?.adminAuthHeadingTextview?.text =
-          resourceHandler.getStringInLocale(R.string.admin_auth_heading)
+          resourceHandler.getStringInLocale(R.string.admin_auth_activity_heading_text)
         binding?.adminAuthSubText?.text =
-          resourceHandler.getStringInLocale(R.string.admin_auth_sub)
+          resourceHandler.getStringInLocale(R.string.admin_auth_activity_subheading_text)
       }
     }
   }
diff --git a/app/src/main/java/org/oppia/android/app/profile/AdminPinActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/AdminPinActivityPresenter.kt
index 5ab5624b99f..1eca7c634e5 100644
--- a/app/src/main/java/org/oppia/android/app/profile/AdminPinActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/profile/AdminPinActivityPresenter.kt
@@ -45,7 +45,9 @@ class AdminPinActivityPresenter @Inject constructor(
     activity.setSupportActionBar(binding.adminPinToolbar)
     activity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
     activity.supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp)
-    activity.supportActionBar?.setHomeActionContentDescription(R.string.admin_auth_close)
+    activity.supportActionBar?.setHomeActionContentDescription(
+      R.string.admin_auth_activity_tool_bar_content_desc
+    )
 
     binding.apply {
       lifecycleOwner = activity
@@ -95,7 +97,7 @@ class AdminPinActivityPresenter @Inject constructor(
       if (inputPin.length < 5) {
         adminViewModel.pinErrorMsg.set(
           resourceHandler.getStringInLocale(
-            R.string.admin_pin_error_pin_length
+            R.string.admin_pin_activity_pin_length_error
           )
         )
         failed = true
@@ -103,7 +105,7 @@ class AdminPinActivityPresenter @Inject constructor(
       if (inputPin != confirmPin) {
         adminViewModel.confirmPinErrorMsg.set(
           resourceHandler.getStringInLocale(
-            R.string.admin_pin_error_pin_confirm_wrong
+            R.string.admin_pin_activity_wrong_pin_text
           )
         )
         failed = true
diff --git a/app/src/main/java/org/oppia/android/app/profile/AdminSettingsDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/AdminSettingsDialogFragmentPresenter.kt
index c0faded0563..1072e2ccecb 100644
--- a/app/src/main/java/org/oppia/android/app/profile/AdminSettingsDialogFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/profile/AdminSettingsDialogFragmentPresenter.kt
@@ -58,11 +58,11 @@ class AdminSettingsDialogFragmentPresenter @Inject constructor(
     }
 
     val dialog = AlertDialog.Builder(activity, R.style.OppiaAlertDialogTheme)
-      .setTitle(R.string.admin_settings_heading)
+      .setTitle(R.string.admin_settings_dialog_heading)
       .setView(binding.root)
-      .setMessage(R.string.admin_settings_sub)
-      .setPositiveButton(R.string.admin_settings_submit, null)
-      .setNegativeButton(R.string.admin_settings_cancel) { dialog, _ ->
+      .setMessage(R.string.admin_settings_dialog_message_text)
+      .setPositiveButton(R.string.admin_settings_dialog_submit_button_text, null)
+      .setNegativeButton(R.string.admin_settings_dialog_cancel_button_text) { dialog, _ ->
         dialog.dismiss()
       }
       .create()
@@ -82,7 +82,7 @@ class AdminSettingsDialogFragmentPresenter @Inject constructor(
         if (binding.adminSettingsInputPinEditText.text?.isEmpty()!!) {
           adminViewModel.errorMessage.set(
             resourceHandler.getStringInLocale(
-              R.string.admin_auth_null
+              R.string.admin_auth_activity_null_pin_input_label
             )
           )
           return@setOnClickListener
@@ -92,7 +92,7 @@ class AdminSettingsDialogFragmentPresenter @Inject constructor(
         } else {
           adminViewModel.errorMessage.set(
             resourceHandler.getStringInLocale(
-              R.string.admin_settings_incorrect
+              R.string.admin_settings_dialog_incorrect_pin_error_text
             )
           )
         }
diff --git a/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivityPresenter.kt
index 57c999e2586..4f4593f8241 100644
--- a/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivityPresenter.kt
@@ -32,7 +32,8 @@ class PinPasswordActivityPresenter @Inject constructor(
   private val viewModelProvider: ViewModelProvider<PinPasswordViewModel>,
   private val resourceHandler: AppLanguageResourceHandler
 ) {
-  @Inject lateinit var accessibilityService: AccessibilityService
+  @Inject
+  lateinit var accessibilityService: AccessibilityService
   private val pinViewModel by lazy {
     getPinPasswordViewModel()
   }
@@ -103,7 +104,7 @@ class PinPasswordActivityPresenter @Inject constructor(
               )
           } else {
             pinViewModel.errorMessage.set(
-              resourceHandler.getStringInLocale(R.string.pin_password_incorrect_pin)
+              resourceHandler.getStringInLocale(R.string.pin_password_activity_incorrect_pin_error)
             )
             binding.pinPasswordInputPinEditText.startAnimation(
               AnimationUtils.loadAnimation(
@@ -177,14 +178,16 @@ class PinPasswordActivityPresenter @Inject constructor(
     pinViewModel.showAdminPinForgotPasswordPopUp.set(true)
     val resetDataButtonText =
       resourceHandler.getStringInLocaleWithWrapping(
-        R.string.admin_forgot_pin_reset_app_data_button_text, appName
+        R.string.pin_password_activity_reset_app_data_button_text, appName
       )
     alertDialog = AlertDialog.Builder(activity, R.style.OppiaAlertDialogTheme)
-      .setTitle(R.string.pin_password_forgot_title)
+      .setTitle(R.string.pin_password_activity_dialog_forgot_title)
       .setMessage(
-        resourceHandler.getStringInLocaleWithWrapping(R.string.admin_forgot_pin_message, appName)
+        resourceHandler.getStringInLocaleWithWrapping(
+          R.string.pin_password_activity_dialog_forgot_message, appName
+        )
       )
-      .setNegativeButton(R.string.admin_settings_cancel) { dialog, _ ->
+      .setNegativeButton(R.string.admin_settings_dialog_cancel_button_text) { dialog, _ ->
         pinViewModel.showAdminPinForgotPasswordPopUp.set(false)
         dialog.dismiss()
       }
@@ -202,19 +205,23 @@ class PinPasswordActivityPresenter @Inject constructor(
     alertDialog = AlertDialog.Builder(activity, R.style.OppiaAlertDialogTheme)
       .setTitle(
         resourceHandler.getStringInLocaleWithWrapping(
-          R.string.admin_confirm_app_wipe_title, appName
+          R.string.pin_password_activity_reset_dialog_title, appName
         )
       )
       .setMessage(
         resourceHandler.getStringInLocaleWithWrapping(
-          R.string.admin_confirm_app_wipe_message, appName
+          R.string.pin_password_activity_reset_dialog_message, appName
         )
       )
-      .setNegativeButton(R.string.admin_confirm_app_wipe_negative_button_text) { dialog, _ ->
+      .setNegativeButton(
+        R.string.pin_password_activity_reset_dialog_negative_button_text
+      ) { dialog, _ ->
         pinViewModel.showAdminPinForgotPasswordPopUp.set(false)
         dialog.dismiss()
       }
-      .setPositiveButton(R.string.admin_confirm_app_wipe_positive_button_text) { dialog, _ ->
+      .setPositiveButton(
+        R.string.pin_password_activity_reset_dialog_postive_button_text
+      ) { dialog, _ ->
         profileManagementController.deleteAllProfiles().toLiveData().observe(
           activity,
           {
@@ -244,8 +251,8 @@ class PinPasswordActivityPresenter @Inject constructor(
 
   private fun showSuccessDialog() {
     AlertDialog.Builder(activity, R.style.OppiaAlertDialogTheme)
-      .setMessage(R.string.pin_password_success)
-      .setPositiveButton(R.string.pin_password_close) { dialog, _ ->
+      .setMessage(R.string.pin_password_activity_success_text)
+      .setPositiveButton(R.string.pin_password_activity_close_text) { dialog, _ ->
         dialog.dismiss()
       }.create().show()
   }
diff --git a/app/src/main/java/org/oppia/android/app/profile/PinPasswordViewModel.kt b/app/src/main/java/org/oppia/android/app/profile/PinPasswordViewModel.kt
index a448f9d67e8..3921b20a33b 100644
--- a/app/src/main/java/org/oppia/android/app/profile/PinPasswordViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/profile/PinPasswordViewModel.kt
@@ -39,7 +39,9 @@ class PinPasswordViewModel @Inject constructor(
 
   val helloText: LiveData<String> by lazy {
     Transformations.map(profile) { profile ->
-      resourceHandler.getStringInLocaleWithWrapping(R.string.pin_password_hello, profile.name)
+      resourceHandler.getStringInLocaleWithWrapping(
+        R.string.pin_password_activity_hello_text, profile.name
+      )
     }
   }
 
diff --git a/app/src/main/java/org/oppia/android/app/profile/ResetPinDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/ResetPinDialogFragmentPresenter.kt
index bf81773b519..875df3c3bc2 100644
--- a/app/src/main/java/org/oppia/android/app/profile/ResetPinDialogFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/profile/ResetPinDialogFragmentPresenter.kt
@@ -66,15 +66,15 @@ class ResetPinDialogFragmentPresenter @Inject constructor(
     }
 
     val dialog = AlertDialog.Builder(activity, R.style.OppiaAlertDialogTheme)
-      .setTitle(R.string.reset_pin_enter)
+      .setTitle(R.string.pin_password_activity_reset_pin_dialog_title)
       .setView(binding.root)
       .setMessage(
         resourceHandler.getStringInLocaleWithWrapping(
-          R.string.reset_pin_enter_dialog_message, name
+          R.string.pin_password_activity_reset_pin_dialog_message, name
         )
       )
-      .setPositiveButton(R.string.admin_settings_submit, null)
-      .setNegativeButton(R.string.admin_settings_cancel) { dialog, _ ->
+      .setPositiveButton(R.string.admin_settings_dialog_submit_button_text, null)
+      .setNegativeButton(R.string.admin_settings_dialog_cancel_button_text) { dialog, _ ->
         dialog.dismiss()
       }
       .create()
@@ -108,7 +108,7 @@ class ResetPinDialogFragmentPresenter @Inject constructor(
         } else {
           resetViewModel.errorMessage.set(
             resourceHandler.getStringInLocale(
-              R.string.add_profile_error_pin_length
+              R.string.add_profile_activity_pin_length_error_text
             )
           )
         }
diff --git a/app/src/main/java/org/oppia/android/app/profile/ResetPinViewModel.kt b/app/src/main/java/org/oppia/android/app/profile/ResetPinViewModel.kt
index 234a30a9f3c..b59a63abc92 100644
--- a/app/src/main/java/org/oppia/android/app/profile/ResetPinViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/profile/ResetPinViewModel.kt
@@ -25,7 +25,7 @@ class ResetPinViewModel @Inject constructor(
 
   private fun computeResetPinInputPinHint(name: String): String {
     return resourceHandler.getStringInLocaleWithWrapping(
-      R.string.admin_settings_enter_user_new_pin, name
+      R.string.admin_settings_dialog_new_pin_text, name
     )
   }
 }
diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureEditDialogFragment.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureEditDialogFragment.kt
index f17a841929d..3b9331e94b0 100644
--- a/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureEditDialogFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/profileprogress/ProfilePictureEditDialogFragment.kt
@@ -54,9 +54,9 @@ class ProfilePictureEditDialogFragment : InjectableDialogFragment() {
     }
     return AlertDialog
       .Builder(ContextThemeWrapper(activity as Context, R.style.OppiaDialogFragmentTheme))
-      .setTitle(R.string.profile_progress_edit_dialog_title)
+      .setTitle(R.string.profile_picture_edit_dialog_title)
       .setView(view)
-      .setNegativeButton(R.string.profile_picture_edit_alert_dialog_cancel_button) { _, _ ->
+      .setNegativeButton(R.string.profile_picture_edit_dialog_cancel_button_text) { _, _ ->
         dismiss()
       }
       .create()
diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivityPresenter.kt
index 562e38f3d9f..dcb48a74ebc 100644
--- a/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/profileprogress/ProfileProgressActivityPresenter.kt
@@ -36,7 +36,7 @@ class ProfileProgressActivityPresenter @Inject constructor(
       R.id.profile_progress_activity_toolbar
     ) as Toolbar
     activity.setSupportActionBar(toolbar)
-    (activity.supportActionBar ?: return).setTitle(R.string.profile)
+    (activity.supportActionBar ?: return).setTitle(R.string.profile_progress_activity_profile_title)
     (activity.supportActionBar ?: return).setDisplayShowHomeEnabled(true)
     (activity.supportActionBar ?: return).setDisplayHomeAsUpEnabled(true)
     toolbar.setNavigationOnClickListener {
diff --git a/app/src/main/java/org/oppia/android/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt
index fabe3eb83dc..940ba45f21a 100644
--- a/app/src/main/java/org/oppia/android/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/profileprogress/RecentlyPlayedStorySummaryViewModel.kt
@@ -40,7 +40,7 @@ class RecentlyPlayedStorySummaryViewModel(
 
   fun computeLessonThumbnailContentDescription(): String {
     return resourceHandler.getStringInLocaleWithWrapping(
-      R.string.lesson_thumbnail_content_description, nextChapterTitle
+      R.string.home_activity_lesson_thumbnail_description, nextChapterTitle
     )
   }
 
diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditDeletionDialogFragment.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditDeletionDialogFragment.kt
index 27b1914a650..23917136ef0 100644
--- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditDeletionDialogFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileEditDeletionDialogFragment.kt
@@ -48,12 +48,12 @@ class ProfileEditDeletionDialogFragment : InjectableDialogFragment() {
       parentFragment as ProfileEditFragment
 
     val alertDialog = AlertDialog.Builder(activity as Context, R.style.OppiaAlertDialogTheme)
-      .setTitle(R.string.profile_edit_delete_dialog_title)
-      .setMessage(R.string.profile_edit_delete_dialog_message)
-      .setNegativeButton(R.string.profile_edit_delete_dialog_negative) { dialog, _ ->
+      .setTitle(R.string.profile_edit_activity_dialog_title)
+      .setMessage(R.string.profile_edit_activity_dialog_message)
+      .setNegativeButton(R.string.profile_edit_activity_dialog_negative_button) { dialog, _ ->
         dialog.dismiss()
       }
-      .setPositiveButton(R.string.profile_edit_delete_dialog_positive) { dialog, _ ->
+      .setPositiveButton(R.string.profile_edit_activity_dialog_positive_button) { dialog, _ ->
         profileEditDialogInterface.deleteProfileByInternalProfileId(internalProfileId)
       }
       .create()
diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameFragmentPresenter.kt
index 6350c2e4581..4ec0d2e7116 100644
--- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileRenameFragmentPresenter.kt
@@ -57,7 +57,7 @@ class ProfileRenameFragmentPresenter @Inject constructor(
           .nameErrorMsg
           .set(
             resourceHandler.getStringInLocale(
-              R.string.add_profile_error_name_empty
+              R.string.add_profile_activity_name_empty_error_text
             )
           )
         return@setOnClickListener
@@ -110,13 +110,13 @@ class ProfileRenameFragmentPresenter @Inject constructor(
         is ProfileManagementController.ProfileNameNotUniqueException ->
           renameViewModel.nameErrorMsg.set(
             resourceHandler.getStringInLocale(
-              R.string.add_profile_error_name_not_unique
+              R.string.add_profile_activity_name_not_unique_error_text
             )
           )
         is ProfileManagementController.ProfileNameOnlyLettersException ->
           renameViewModel.nameErrorMsg.set(
             resourceHandler.getStringInLocale(
-              R.string.add_profile_error_name_only_letters
+              R.string.add_profile_activity_name_only_letters_error_text
             )
           )
       }
diff --git a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinFragmentPresenter.kt
index b4afe1d73e1..d2286eadd1a 100644
--- a/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/settings/profile/ProfileResetPinFragmentPresenter.kt
@@ -103,7 +103,7 @@ class ProfileResetPinFragmentPresenter @Inject constructor(
         if (pin.length < 5) {
           viewModel.pinErrorMsg.set(
             resourceHandler.getStringInLocale(
-              R.string.profile_reset_pin_error_admin_pin_length
+              R.string.profile_reset_pin_fragment_error_admin_pin_length
             )
           )
           failed = true
@@ -112,7 +112,7 @@ class ProfileResetPinFragmentPresenter @Inject constructor(
         if (pin.length < 3) {
           viewModel.pinErrorMsg.set(
             resourceHandler.getStringInLocale(
-              R.string.profile_reset_pin_error_user_pin_length
+              R.string.profile_reset_pin_fragment_error_user_pin_length
             )
           )
           failed = true
@@ -121,7 +121,7 @@ class ProfileResetPinFragmentPresenter @Inject constructor(
       if (pin != confirmPin) {
         viewModel.confirmErrorMsg.set(
           resourceHandler.getStringInLocale(
-            R.string.add_profile_error_pin_confirm_wrong
+            R.string.add_profile_activity_wrong_confirm_pin_error_text
           )
         )
         failed = true
diff --git a/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt
index 2433999b826..86c2ddc76a6 100644
--- a/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/story/StoryFragmentPresenter.kt
@@ -183,7 +183,7 @@ class StoryFragmentPresenter @Inject constructor(
             == ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES
           ) {
             val missingPrerequisiteSummary = resourceHandler.getStringInLocaleWithWrapping(
-              R.string.chapter_prerequisite_title_label,
+              R.string.topic_fragment_lessons_chapter_prerequisite_label,
               storyItemViewModel.index.toString(),
               storyItemViewModel.missingPrerequisiteChapterTitle
             )
diff --git a/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
index 746af71c90b..8971a1ea1ac 100644
--- a/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/story/storyitemviewmodel/StoryChapterSummaryViewModel.kt
@@ -120,7 +120,7 @@ class StoryChapterSummaryViewModel(
         chapterSummary.title, ephemeralChapterSummary.writtenTranslationContext
       )
     return resourceHandler.getStringInLocaleWithWrapping(
-      R.string.chapter_name, (index + 1).toString(), title
+      R.string.topic_fragment_lessons_chapter_play_name_text, (index + 1).toString(), title
     )
   }
 }
diff --git a/app/src/main/java/org/oppia/android/app/survey/SurveyOutroDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/survey/SurveyOutroDialogFragmentPresenter.kt
index 8399bb9a0e5..01b5a4d9721 100644
--- a/app/src/main/java/org/oppia/android/app/survey/SurveyOutroDialogFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/survey/SurveyOutroDialogFragmentPresenter.kt
@@ -38,7 +38,7 @@ class SurveyOutroDialogFragmentPresenter @Inject constructor(
 
     val appName = resourceHandler.getStringInLocale(R.string.app_name)
     binding.surveyOnboardingText.text = resourceHandler.getStringInLocaleWithWrapping(
-      R.string.survey_thank_you_message_text, appName
+      R.string.survey_activity_outer_dialog_thank_you_message, appName
     )
 
     binding.finishSurveyButton.setOnClickListener {
diff --git a/app/src/main/java/org/oppia/android/app/survey/SurveyViewModel.kt b/app/src/main/java/org/oppia/android/app/survey/SurveyViewModel.kt
index 0979177affe..58e398774da 100644
--- a/app/src/main/java/org/oppia/android/app/survey/SurveyViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/survey/SurveyViewModel.kt
@@ -68,22 +68,22 @@ class SurveyViewModel @Inject constructor(
     val appName = resourceHandler.getStringInLocale(R.string.app_name)
     return when (questionName) {
       SurveyQuestionName.USER_TYPE -> resourceHandler.getStringInLocale(
-        R.string.user_type_question
+        R.string.survey_fragment_user_type_question
       )
       SurveyQuestionName.MARKET_FIT -> resourceHandler.getStringInLocaleWithWrapping(
-        R.string.market_fit_question, appName
+        R.string.survey_fragment_market_fit_question, appName
       )
       SurveyQuestionName.NPS -> resourceHandler.getStringInLocaleWithWrapping(
-        R.string.nps_score_question, appName
+        R.string.survey_fragment_nps_score_question, appName
       )
       SurveyQuestionName.PROMOTER_FEEDBACK -> resourceHandler.getStringInLocaleWithWrapping(
-        R.string.nps_promoter_feedback_question, appName
+        R.string.survey_fragment_nps_promoter_feedback_question, appName
       )
       SurveyQuestionName.PASSIVE_FEEDBACK -> resourceHandler.getStringInLocaleWithWrapping(
-        R.string.nps_passive_feedback_question
+        R.string.survey_fragment_nps_passive_feedback_question
       )
       SurveyQuestionName.DETRACTOR_FEEDBACK -> resourceHandler.getStringInLocaleWithWrapping(
-        R.string.nps_detractor_feedback_question
+        R.string.survey_fragment_nps_detractor_feedback_question
       )
       SurveyQuestionName.UNRECOGNIZED, SurveyQuestionName.QUESTION_NAME_UNSPECIFIED ->
         DEFAULT_QUESTION
diff --git a/app/src/main/java/org/oppia/android/app/survey/surveyitemviewmodel/MarketFitItemsViewModel.kt b/app/src/main/java/org/oppia/android/app/survey/surveyitemviewmodel/MarketFitItemsViewModel.kt
index e2b7fe43a5e..eb6a577f0e8 100644
--- a/app/src/main/java/org/oppia/android/app/survey/surveyitemviewmodel/MarketFitItemsViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/survey/surveyitemviewmodel/MarketFitItemsViewModel.kt
@@ -104,7 +104,7 @@ class MarketFitItemsViewModel @Inject constructor(
         when (marketFitAnswer) {
           MarketFitAnswer.VERY_DISAPPOINTED -> MultipleChoiceOptionContentViewModel(
             resourceHandler.getStringInLocale(
-              R.string.market_fit_answer_very_disappointed
+              R.string.survey_fragment_market_fit_answer_very_disappointed
             ),
             index,
             this
@@ -112,7 +112,7 @@ class MarketFitItemsViewModel @Inject constructor(
 
           MarketFitAnswer.DISAPPOINTED -> MultipleChoiceOptionContentViewModel(
             resourceHandler.getStringInLocale(
-              R.string.market_fit_answer_somewhat_disappointed
+              R.string.survey_fragment_market_fit_answer_somewhat_disappointed
             ),
             index,
             this
@@ -120,7 +120,7 @@ class MarketFitItemsViewModel @Inject constructor(
 
           MarketFitAnswer.NOT_DISAPPOINTED -> MultipleChoiceOptionContentViewModel(
             resourceHandler.getStringInLocale(
-              R.string.market_fit_answer_not_disappointed
+              R.string.survey_fragment_market_fit_answer_not_disappointed
             ),
             index,
             this
@@ -129,7 +129,7 @@ class MarketFitItemsViewModel @Inject constructor(
           MarketFitAnswer.NOT_APPLICABLE_WONT_USE_OPPIA_ANYMORE ->
             MultipleChoiceOptionContentViewModel(
               resourceHandler.getStringInLocaleWithWrapping(
-                R.string.market_fit_answer_wont_use_oppia,
+                R.string.survey_fragment_market_fit_answer_wont_use_oppia,
                 appName
               ),
               index,
diff --git a/app/src/main/java/org/oppia/android/app/survey/surveyitemviewmodel/UserTypeItemsViewModel.kt b/app/src/main/java/org/oppia/android/app/survey/surveyitemviewmodel/UserTypeItemsViewModel.kt
index 14482c2775e..76cb92c59a1 100644
--- a/app/src/main/java/org/oppia/android/app/survey/surveyitemviewmodel/UserTypeItemsViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/survey/surveyitemviewmodel/UserTypeItemsViewModel.kt
@@ -104,14 +104,14 @@ class UserTypeItemsViewModel @Inject constructor(
           UserTypeAnswer.LEARNER ->
             MultipleChoiceOptionContentViewModel(
               resourceHandler.getStringInLocale(
-                R.string.user_type_answer_learner
+                R.string.survey_fragment_user_type_answer_learner
               ),
               index,
               this
             )
           UserTypeAnswer.TEACHER -> MultipleChoiceOptionContentViewModel(
             resourceHandler.getStringInLocale(
-              R.string.user_type_answer_teacher
+              R.string.survey_fragment_user_type_answer_teacher
             ),
             index,
             this
@@ -120,7 +120,7 @@ class UserTypeItemsViewModel @Inject constructor(
           UserTypeAnswer.PARENT ->
             MultipleChoiceOptionContentViewModel(
               resourceHandler.getStringInLocale(
-                R.string.user_type_answer_parent
+                R.string.survey_fragment_user_type_answer_parent
               ),
               index,
               this
@@ -129,7 +129,7 @@ class UserTypeItemsViewModel @Inject constructor(
           UserTypeAnswer.OTHER ->
             MultipleChoiceOptionContentViewModel(
               resourceHandler.getStringInLocale(
-                R.string.user_type_answer_other
+                R.string.survey_fragment_user_type_answer_other
               ),
               index,
               this
diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt
index b7bb9548635..c423ded10f7 100644
--- a/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/TopicFragmentPresenter.kt
@@ -89,7 +89,7 @@ class TopicFragmentPresenter @Inject constructor(
         lessonsTabView?.let { lessonsTabView ->
           val lessonsTabSpotlightTarget = SpotlightTarget(
             lessonsTabView,
-            resourceHandler.getStringInLocale(R.string.topic_lessons_tab_spotlight_hint),
+            resourceHandler.getStringInLocale(R.string.topic_fragment_lessons_tab_spotlight_hint),
             SpotlightShape.RoundedRectangle,
             Spotlight.FeatureCase.TOPIC_LESSON_TAB
           )
@@ -99,7 +99,9 @@ class TopicFragmentPresenter @Inject constructor(
             val revisionTabView = tabLayout.getTabAt(computeTabPosition(TopicTab.REVISION))?.view
             val revisionTabSpotlightTarget = SpotlightTarget(
               revisionTabView!!,
-              resourceHandler.getStringInLocale(R.string.topic_revision_tab_spotlight_hint),
+              resourceHandler.getStringInLocale(
+                R.string.topic_fragment_revision_tab_spotlight_hint
+              ),
               SpotlightShape.RoundedRectangle,
               Spotlight.FeatureCase.TOPIC_REVISION_TAB
             )
diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicTab.kt b/app/src/main/java/org/oppia/android/app/topic/TopicTab.kt
index 3fbcead8bb6..117b868e322 100644
--- a/app/src/main/java/org/oppia/android/app/topic/TopicTab.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/TopicTab.kt
@@ -15,30 +15,30 @@ enum class TopicTab(
   INFO(
     positionWithTwoTabs = -1,
     positionWithFourTabs = 0,
-    tabLabelResId = R.string.info,
+    tabLabelResId = R.string.topic_fragment_info,
     tabIconResId = R.drawable.ic_info_icon_24dp,
-    contentDescriptionResId = R.string.info_tab_content_description
+    contentDescriptionResId = R.string.topic_fragment_info_tab_content_description
   ),
   LESSONS(
     positionWithTwoTabs = 0,
     positionWithFourTabs = 1,
-    tabLabelResId = R.string.lessons,
+    tabLabelResId = R.string.topic_fragment_lessons,
     tabIconResId = R.drawable.ic_lessons_icon_24dp,
-    contentDescriptionResId = R.string.lessons_tab_content_description
+    contentDescriptionResId = R.string.topic_fragment_lessons_tab_content_description
   ),
   PRACTICE(
     positionWithTwoTabs = -1,
     positionWithFourTabs = 2,
-    tabLabelResId = R.string.practice,
+    tabLabelResId = R.string.topic_fragment_practice,
     tabIconResId = R.drawable.ic_practice_icon_24dp,
-    contentDescriptionResId = R.string.practice_tab_content_description
+    contentDescriptionResId = R.string.topic_fragment_practice_tab_content_description
   ),
   REVISION(
     positionWithTwoTabs = 1,
     positionWithFourTabs = 3,
-    tabLabelResId = R.string.revision,
+    tabLabelResId = R.string.topic_fragment_revision,
     tabIconResId = R.drawable.ic_revision_icon_24dp,
-    contentDescriptionResId = R.string.revision_tab_content_description
+    contentDescriptionResId = R.string.topic_fragment_revision_tab_content_description
   );
 
   companion object {
diff --git a/app/src/main/java/org/oppia/android/app/topic/TopicViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/TopicViewModel.kt
index 5febc7267c4..baf2c2ff9d3 100644
--- a/app/src/main/java/org/oppia/android/app/topic/TopicViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/TopicViewModel.kt
@@ -79,7 +79,7 @@ class TopicViewModel @Inject constructor(
         translationController.extractString(
           ephemeralTopic.topic.title, ephemeralTopic.writtenTranslationContext
         )
-      resourceHandler.getStringInLocaleWithWrapping(R.string.topic_name, topicTitle)
+      resourceHandler.getStringInLocaleWithWrapping(R.string.topic_fragment_name_text, topicTitle)
     }
   }
 
diff --git a/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentPresenter.kt
index b33e85cba61..5660c2e082e 100644
--- a/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentPresenter.kt
@@ -57,7 +57,7 @@ class ConceptCardFragmentPresenter @Inject constructor(
 
     binding.conceptCardToolbar.setNavigationIcon(R.drawable.ic_close_white_24dp)
     binding.conceptCardToolbar.setNavigationContentDescription(
-      R.string.navigate_up
+      R.string.navigate_up_text
     )
     binding.conceptCardToolbar.setNavigationOnClickListener {
       (fragment.requireActivity() as? ConceptCardListener)?.dismissConceptCard()
diff --git a/app/src/main/java/org/oppia/android/app/topic/info/TopicInfoViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/info/TopicInfoViewModel.kt
index edc1f4f38c2..7ef36615ca9 100644
--- a/app/src/main/java/org/oppia/android/app/topic/info/TopicInfoViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/info/TopicInfoViewModel.kt
@@ -76,7 +76,9 @@ class TopicInfoViewModel @Inject constructor(
       }
     } ?: resourceHandler.getStringInLocale(R.string.unknown_size)
     topicSizeText.set(
-      resourceHandler.getStringInLocaleWithWrapping(R.string.topic_download_text, sizeWithUnit)
+      resourceHandler.getStringInLocaleWithWrapping(
+        R.string.topic_fragment_download_text, sizeWithUnit
+      )
     )
   }
 
diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt
index 857bf87d91a..0d85cb8ffc9 100644
--- a/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/lessons/ChapterSummaryViewModel.kt
@@ -27,13 +27,15 @@ class ChapterSummaryViewModel(
     return when (chapterPlayState) {
       ChapterPlayState.COMPLETED -> {
         resourceHandler.getStringInLocaleWithWrapping(
-          R.string.chapter_completed, (index + 1).toString(), chapterTitle
+          R.string.topic_fragment_lessons_chapter_completed_text,
+          (index + 1).toString(),
+          chapterTitle
         )
       }
       ChapterPlayState.NOT_PLAYABLE_MISSING_PREREQUISITES -> {
         if (previousChapterTitle != null) {
           resourceHandler.getStringInLocaleWithWrapping(
-            R.string.chapter_locked_prerequisite_title_label,
+            R.string.topic_fragment_lessons_chapter_locked_prerequisite_label,
             (index + 1).toString(),
             chapterTitle,
             index.toString(),
@@ -41,13 +43,15 @@ class ChapterSummaryViewModel(
           )
         } else {
           resourceHandler.getStringInLocaleWithWrapping(
-            R.string.chapter_prerequisite_title_label_without_chapter_title
+            R.string.topic_fragment_lessons_without_chapter_prerequisite_label
           )
         }
       }
       else -> {
         resourceHandler.getStringInLocaleWithWrapping(
-          R.string.chapter_in_progress, (index + 1).toString(), chapterTitle
+          R.string.topic_fragment_lessons_chapter_in_progress_text,
+          (index + 1).toString(),
+          chapterTitle
         )
       }
     }
@@ -55,7 +59,7 @@ class ChapterSummaryViewModel(
 
   fun computePlayChapterIndexText(): String {
     return resourceHandler.getStringInLocaleWithWrapping(
-      R.string.topic_play_chapter_index, (index + 1).toString()
+      R.string.topic_fragment_lessons_chapter_play_index, (index + 1).toString()
     )
   }
 }
diff --git a/app/src/main/java/org/oppia/android/app/topic/lessons/StorySummaryViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/lessons/StorySummaryViewModel.kt
index 6e0ef58019f..93cc3805a04 100644
--- a/app/src/main/java/org/oppia/android/app/topic/lessons/StorySummaryViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/lessons/StorySummaryViewModel.kt
@@ -55,16 +55,16 @@ class StorySummaryViewModel(
   fun computeProgressContainerContentDescription(): String {
     return if (storyPercentage.get()!! < 100) {
       "${storyProgressPercentageText.get()} " +
-        resourceHandler.getStringInLocale(R.string.status_in_progress)
+        resourceHandler.getStringInLocale(R.string.topic_fragment_lessons_story_status_in_progress)
     } else {
       "${storyProgressPercentageText.get()} " +
-        resourceHandler.getStringInLocale(R.string.status_completed)
+        resourceHandler.getStringInLocale(R.string.topic_fragment_lessons_story_status_completed)
     }
   }
 
   private fun computeStoryProgressPercentageText(storyPercentage: Int): String {
     return resourceHandler.getStringInLocaleWithWrapping(
-      R.string.topic_story_progress_percentage, storyPercentage.toString()
+      R.string.topic_fragment_lessons_story_progress_percentage, storyPercentage.toString()
     )
   }
 
diff --git a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerViewModel.kt
index ee470eb7b66..65549025c84 100644
--- a/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/questionplayer/QuestionPlayerViewModel.kt
@@ -82,10 +82,12 @@ class QuestionPlayerViewModel @Inject constructor(
     isAtEndOfSession: Boolean
   ): String {
     return if (isAtEndOfSession) {
-      resourceHandler.getStringInLocale(R.string.question_training_session_progress_finished)
+      resourceHandler.getStringInLocale(
+        R.string.topic_fragment_question_training_session_progress_finished
+      )
     } else {
       resourceHandler.getStringInLocaleWithWrapping(
-        R.string.question_training_session_progress,
+        R.string.topic_fragment_question_training_session_progress,
         currentQuestion.toString(),
         questionCount.toString()
       )
diff --git a/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardViewModel.kt b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardViewModel.kt
index 3f0ef5010d3..80789cc8dbd 100755
--- a/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardViewModel.kt
+++ b/app/src/main/java/org/oppia/android/app/topic/revisioncard/RevisionCardViewModel.kt
@@ -107,11 +107,11 @@ class RevisionCardViewModel private constructor(
   fun computeContentDescriptionText(subtopicLiveData: LiveData<EphemeralSubtopic>): String {
     return when (subtopicLiveData) {
       previousSubtopicLiveData -> appLanguageResourceHandler.getStringInLocaleWithWrapping(
-        R.string.previous_subtopic_talkback_text,
+        R.string.topic_fragment_revision_previous_subtopic_talkback_text,
         computeTitleText(previousSubtopicLiveData.value)
       )
       nextSubtopicLiveData -> appLanguageResourceHandler.getStringInLocaleWithWrapping(
-        R.string.next_subtopic_talkback_text,
+        R.string.topic_fragment_revision_next_subtopic_talkback_text,
         computeTitleText(nextSubtopicLiveData.value)
       )
       else -> ""
diff --git a/app/src/main/java/org/oppia/android/app/utility/datetime/DateTimeUtil.kt b/app/src/main/java/org/oppia/android/app/utility/datetime/DateTimeUtil.kt
index 43fb02e01c0..b3b9338e1c5 100644
--- a/app/src/main/java/org/oppia/android/app/utility/datetime/DateTimeUtil.kt
+++ b/app/src/main/java/org/oppia/android/app/utility/datetime/DateTimeUtil.kt
@@ -18,13 +18,13 @@ class DateTimeUtil @Inject constructor(
     return when (machineLocale.getCurrentTimeOfDay()) {
       OppiaLocale.MachineLocale.TimeOfDay.MID_MORNING,
       OppiaLocale.MachineLocale.TimeOfDay.EARLY_MORNING ->
-        resourceHandler.getStringInLocale(R.string.home_screen_good_morning_greeting_fragment)
+        resourceHandler.getStringInLocale(R.string.home_activity_good_morning_greeting_text)
       OppiaLocale.MachineLocale.TimeOfDay.AFTERNOON ->
-        resourceHandler.getStringInLocale(R.string.home_screen_good_afternoon_greeting_fragment)
+        resourceHandler.getStringInLocale(R.string.home_activity_good_afternoon_greeting_text)
       OppiaLocale.MachineLocale.TimeOfDay.EVENING,
       OppiaLocale.MachineLocale.TimeOfDay.UNKNOWN,
       OppiaLocale.MachineLocale.TimeOfDay.LATE_NIGHT ->
-        resourceHandler.getStringInLocale(R.string.home_screen_good_evening_greeting_fragment)
+        resourceHandler.getStringInLocale(R.string.home_activity_good_evening_greeting_text)
     }
   }
 
diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragmentPresenter.kt
index 1b2658ba0ff..88e9bd7b9ee 100644
--- a/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/walkthrough/end/WalkthroughFinalFragmentPresenter.kt
@@ -79,7 +79,7 @@ class WalkthroughFinalFragmentPresenter @Inject constructor(
     if (::walkthroughFinalViewModel.isInitialized && ::topicName.isInitialized) {
       walkthroughFinalViewModel.topicTitle.set(
         resourceHandler.getStringInLocaleWithWrapping(
-          R.string.are_you_interested,
+          R.string.walkthrough_activity_are_you_interested_text,
           topicName
         )
       )
diff --git a/app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeFragmentPresenter.kt
index 3c49e08cbc1..25bd988b277 100644
--- a/app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeFragmentPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/walkthrough/welcome/WalkthroughWelcomeFragmentPresenter.kt
@@ -102,7 +102,9 @@ class WalkthroughWelcomeFragmentPresenter @Inject constructor(
   private fun setProfileName() {
     if (::walkthroughWelcomeViewModel.isInitialized && ::profileName.isInitialized) {
       walkthroughWelcomeViewModel.profileName.set(
-        resourceHandler.getStringInLocaleWithWrapping(R.string.welcome, profileName)
+        resourceHandler.getStringInLocaleWithWrapping(
+          R.string.walkthrough_activity_welcome_text, profileName
+        )
       )
     }
   }
diff --git a/app/src/main/res/layout-land/onboarding_fragment.xml b/app/src/main/res/layout-land/onboarding_fragment.xml
index 5b7c6f69e9b..55483cda7c6 100644
--- a/app/src/main/res/layout-land/onboarding_fragment.xml
+++ b/app/src/main/res/layout-land/onboarding_fragment.xml
@@ -41,7 +41,7 @@
       android:minWidth="48dp"
       android:minHeight="48dp"
       android:onClick="@{(v) -> presenter.clickOnSkip()}"
-      android:text="@string/skip"
+      android:text="@string/onboarding_activity_skip_text"
       android:textAllCaps="true"
       android:textColor="@color/component_color_shared_primary_text_color"
       android:visibility="@{viewModel.slideNumber != 3 ? View.VISIBLE: View.GONE, default=visible}"
@@ -66,7 +66,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginEnd="12dp"
-      android:contentDescription="@string/next_arrow"
+      android:contentDescription="@string/onboarding_activity_next_arrow_text"
       android:gravity="center"
       android:minWidth="48dp"
       android:minHeight="48dp"
diff --git a/app/src/main/res/layout-land/onboarding_slide_final.xml b/app/src/main/res/layout-land/onboarding_slide_final.xml
index a62021edc69..30450646095 100644
--- a/app/src/main/res/layout-land/onboarding_slide_final.xml
+++ b/app/src/main/res/layout-land/onboarding_slide_final.xml
@@ -44,7 +44,7 @@
         android:layout_marginTop="80dp"
         android:layout_marginEnd="28dp"
         android:fontFamily="sans-serif-medium"
-        android:text="@string/onboarding_slide_3_title"
+        android:text="@string/onboarding_activity_slide_3_title"
         android:textColor="@color/component_color_shared_primary_text_color"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1.0"
@@ -58,7 +58,7 @@
         android:layout_marginStart="20dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="40dp"
-        android:text="@string/onboarding_slide_3_description"
+        android:text="@string/onboarding_activity_slide_3_description"
         android:textColor="@color/component_color_shared_secondary_1_text_color"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
@@ -76,7 +76,7 @@
         android:fontFamily="sans-serif-medium"
         android:minHeight="48dp"
         android:onClick="@{(v) -> viewModel.clickOnGetStarted()}"
-        android:text="@string/get_started"
+        android:text="@string/onboarding_activity_get_started_text"
         android:textColor="@color/component_color_shared_secondary_4_text_color"
         android:textSize="14sp"
         android:textAllCaps="false"
diff --git a/app/src/main/res/layout-land/profile_chooser_add_view.xml b/app/src/main/res/layout-land/profile_chooser_add_view.xml
index c8921f28044..49ed37b23ad 100644
--- a/app/src/main/res/layout-land/profile_chooser_add_view.xml
+++ b/app/src/main/res/layout-land/profile_chooser_add_view.xml
@@ -45,7 +45,7 @@
         android:id="@+id/add_profile_text"
         style="@style/Caption"
         android:layout_gravity="center"
-        android:text="@{hasProfileEverBeenAddedValue ? @string/profile_chooser_add : @string/set_up_multiple_profiles}"
+        android:text="@{hasProfileEverBeenAddedValue ? @string/profile_chooser_fragment_add_text : @string/profile_chooser_fragment_set_up_multiple_profiles}"
         android:textColor="@color/component_color_shared_secondary_4_text_color" />
 
       <TextView
@@ -53,7 +53,7 @@
         style="@style/TextViewStart"
         android:layout_gravity="center"
         android:fontFamily="sans-serif"
-        android:text="@string/set_up_multiple_profiles_description"
+        android:text="@string/profile_chooser_fragment_add_profile_description_text"
         android:textAlignment="center"
         android:textColor="@color/component_color_shared_secondary_4_text_color"
         android:textSize="12sp"
diff --git a/app/src/main/res/layout-land/profile_chooser_fragment.xml b/app/src/main/res/layout-land/profile_chooser_fragment.xml
index 661da1b5244..05bfa852506 100644
--- a/app/src/main/res/layout-land/profile_chooser_fragment.xml
+++ b/app/src/main/res/layout-land/profile_chooser_fragment.xml
@@ -37,13 +37,13 @@
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintTop_toTopOf="parent"
           app:srcCompat="@drawable/ic_language_icon_grey_24dp"
-          android:contentDescription="@string/language_icon_content_description" />
+          android:contentDescription="@string/profile_chooser_fragment_language_icon_description" />
 
         <TextView
           style="@style/Subtitle1ViewCenter"
           android:minHeight="48dp"
           android:paddingTop="20dp"
-          android:text="@string/profile_chooser_language"
+          android:text="@string/profile_chooser_fragment_language_text"
           android:textColor="@color/component_color_profile_chooser_activity_secondary_options_color"
           android:visibility="gone"
           app:layout_constraintEnd_toStartOf="@+id/profile_chooser_language_icon"
@@ -55,7 +55,7 @@
           android:layout_marginStart="36dp"
           android:layout_marginTop="@dimen/profile_chooser_fragment_profile_select_text_margin_top"
           android:layout_marginEnd="36dp"
-          android:text="@string/profile_chooser_select"
+          android:text="@string/profile_chooser_fragment_select_text"
           android:textColor="@color/component_color_shared_secondary_4_text_color"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toTopOf="parent" />
@@ -103,7 +103,7 @@
         style="@style/Subtitle1ViewCenter"
         android:layout_marginBottom="24dp"
         android:minHeight="48dp"
-        android:text="@string/profile_chooser_administrator_controls"
+        android:text="@string/profile_chooser_fragment_administrator_controls_text"
         android:textColor="@color/component_color_profile_chooser_activity_secondary_options_color" />
 
       <ImageView
@@ -117,7 +117,7 @@
         android:paddingEnd="16dp"
         android:paddingBottom="12dp"
         app:srcCompat="@drawable/ic_settings_grey_48dp"
-        android:contentDescription="@string/setting_icon_content_description" />
+        android:contentDescription="@string/profile_chooser_fragment_setting_icon_description" />
     </LinearLayout>
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout-land/profile_chooser_profile_view.xml b/app/src/main/res/layout-land/profile_chooser_profile_view.xml
index d150c4cfd0f..761f44d3f02 100644
--- a/app/src/main/res/layout-land/profile_chooser_profile_view.xml
+++ b/app/src/main/res/layout-land/profile_chooser_profile_view.xml
@@ -76,7 +76,7 @@
           style="@style/SubtitleLight1Center"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:text="@string/profile_chooser_admin"
+          android:text="@string/profile_chooser_fragment_admin_text"
           android:textColor="@color/component_color_shared_secondary_4_text_color"
           android:visibility="@{viewModel.profile.isAdmin ? View.VISIBLE : View.GONE}" />
       </LinearLayout>
diff --git a/app/src/main/res/layout-land/profile_edit_fragment.xml b/app/src/main/res/layout-land/profile_edit_fragment.xml
index 352b3c2ce86..a2ab759da8e 100644
--- a/app/src/main/res/layout-land/profile_edit_fragment.xml
+++ b/app/src/main/res/layout-land/profile_edit_fragment.xml
@@ -84,7 +84,7 @@
         android:minHeight="48dp"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:text="@string/profile_edit_rename"
+        android:text="@string/profile_edit_activity_rename_text"
         android:textAllCaps="false"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="16sp"
@@ -103,7 +103,7 @@
         android:minHeight="48dp"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:text="@string/profile_edit_reset"
+        android:text="@string/profile_edit_activity_reset_text"
         android:textAllCaps="false"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="16sp"
@@ -123,7 +123,7 @@
         android:minHeight="48dp"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:text="@string/profile_edit_mark_chapter_completion"
+        android:text="@string/profile_edit_activity_mark_chapters_for_completion_button_text"
         android:textAllCaps="false"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="16sp"
@@ -154,7 +154,7 @@
           android:paddingStart="16dp"
           android:paddingTop="12dp"
           android:paddingEnd="24dp"
-          android:text="@string/profile_edit_enable_quick_lesson_language_switching_label"
+          android:text="@string/profile_edit_activity_switching_header_text"
           android:textColor="@color/component_color_shared_primary_text_color"
           android:textSize="16sp"
           app:layout_constraintEnd_toStartOf="@+id/profile_edit_enable_in_lesson_language_switching_switch"
@@ -171,7 +171,7 @@
           android:paddingStart="16dp"
           android:paddingEnd="24dp"
           android:paddingBottom="12dp"
-          android:text="@string/profile_edit_enable_quick_lesson_language_switching_explanation"
+          android:text="@string/profile_edit_activity_switching_label_text"
           android:textColor="@color/component_color_shared_secondary_3_text_color"
           android:textSize="14sp"
           app:layout_constraintEnd_toStartOf="@+id/profile_edit_enable_in_lesson_language_switching_switch"
@@ -215,7 +215,7 @@
           android:paddingStart="16dp"
           android:paddingTop="12dp"
           android:paddingEnd="24dp"
-          android:text="@string/profile_edit_allow_download_heading"
+          android:text="@string/profile_edit_activity_allow_download_heading"
           android:textColor="@color/component_color_shared_primary_text_color"
           android:textSize="16sp"
           app:layout_constraintBottom_toBottomOf="parent"
@@ -232,7 +232,7 @@
           android:paddingStart="16dp"
           android:paddingEnd="24dp"
           android:paddingBottom="12dp"
-          android:text="@string/profile_edit_allow_download_sub"
+          android:text="@string/profile_edit_activity_allow_download_sub"
           android:textColor="@color/component_color_shared_secondary_3_text_color"
           android:textSize="14sp"
           app:layout_constraintEnd_toStartOf="@+id/profile_edit_allow_download_switch"
@@ -266,7 +266,7 @@
         android:minHeight="48dp"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:text="@string/profile_edit_delete"
+        android:text="@string/profile_edit_activity_delete_button_text"
         android:textAllCaps="false"
         android:textColor="@color/component_color_profile_edit_activity_delete_button_text_color"
         android:textSize="16sp"
diff --git a/app/src/main/res/layout-land/profile_progress_header.xml b/app/src/main/res/layout-land/profile_progress_header.xml
index 994327f7beb..1b4224782d2 100644
--- a/app/src/main/res/layout-land/profile_progress_header.xml
+++ b/app/src/main/res/layout-land/profile_progress_header.xml
@@ -25,7 +25,7 @@
       android:layout_width="160dp"
       android:layout_height="160dp"
       android:clickable="true"
-      android:contentDescription="@string/current_profile_picture_content_description"
+      android:contentDescription="@string/add_profile_activity_edit_image_content_description"
       android:focusable="true"
       android:onClick="@{() -> viewModel.clickOnProfilePicture()}"
       android:elevation="4dp"
@@ -39,7 +39,7 @@
     <ImageView
       android:layout_width="56dp"
       android:layout_height="56dp"
-      android:contentDescription="@string/edit_profile_picture_content_description"
+      android:contentDescription="@string/add_profile_activity_edit_user_image_content_description"
       android:onClick="@{() -> viewModel.clickOnProfilePicture()}"
       android:paddingStart="12dp"
       android:paddingEnd="0dp"
@@ -107,7 +107,7 @@
           android:layout_width="60dp"
           android:layout_height="wrap_content"
           android:fontFamily="sans-serif"
-          android:text="@{viewModel.ongoingTopicCount != 1 ? @string/topics_in_progress : @string/topic_in_progress}"
+          android:text="@{viewModel.ongoingTopicCount != 1 ? @string/profile_progress_activity_topics_in_progress_text : @string/profile_progress_activity_topic_in_progress_text}"
           android:textColor="@color/component_color_shared_primary_text_color"
           android:textSize="12sp" />
       </LinearLayout>
@@ -157,7 +157,7 @@
           android:layout_width="60dp"
           android:layout_height="wrap_content"
           android:fontFamily="sans-serif"
-          android:text="@{viewModel.completedStoryCount != 1 ? @string/stories_completed : @string/story_completed}"
+          android:text="@{viewModel.completedStoryCount != 1 ? @string/profile_progress_activity_stories_completed_text : @string/profile_progress_activity_story_completed_text}"
           android:textColor="@color/component_color_shared_primary_text_color"
           android:textSize="12sp" />
       </LinearLayout>
@@ -171,7 +171,7 @@
       android:layout_marginTop="64dp"
       android:fontFamily="sans-serif-medium"
       android:minHeight="48dp"
-      android:text="@string/recently_played_stories"
+      android:text="@string/home_activity_recently_played_stories"
       android:textColor="@color/component_color_shared_primary_text_color"
       android:textSize="18sp"
       android:visibility="@{viewModel.headerTextVisibility}"
@@ -187,7 +187,7 @@
       android:fontFamily="sans-serif-medium"
       android:minHeight="48dp"
       android:onClick="@{() -> viewModel.clickOnViewAll()}"
-      android:text="@string/view_all"
+      android:text="@string/home_activity_view_all_text"
       android:textAllCaps="true"
       android:textColor="@color/component_color_profile_progress_activity_view_all_text_color"
       android:textSize="14sp"
diff --git a/app/src/main/res/layout-land/question_player_fragment.xml b/app/src/main/res/layout-land/question_player_fragment.xml
index 569625bc270..ad785b8bcba 100644
--- a/app/src/main/res/layout-land/question_player_fragment.xml
+++ b/app/src/main/res/layout-land/question_player_fragment.xml
@@ -27,7 +27,7 @@
         android:layout_marginTop="28dp"
         android:layout_marginEnd="28dp"
         android:fontFamily="sans-serif"
-        android:text="@string/question_training_session_finished_header"
+        android:text="@string/topic_fragment_question_end_session_header_text"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="24sp"
         android:visibility="gone"
@@ -42,7 +42,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="28dp"
         android:fontFamily="sans-serif"
-        android:text="@string/question_training_session_finished_message"
+        android:text="@string/topic_fragment_question_end_session_body_text"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="16sp"
         android:visibility="gone"
@@ -147,7 +147,7 @@
         android:layout_height="6dp"
         android:layout_gravity="top|end"
         android:layout_margin="8dp"
-        android:contentDescription="@string/new_hint_available"
+        android:contentDescription="@string/question_player_activity_new_hint_available_text"
         android:visibility="@{viewModel.isHintOpenedAndUnRevealed() ? View.VISIBLE : View.GONE}"
         app:srcCompat="@drawable/ic_dot_yellow_24dp" />
 
@@ -156,7 +156,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="12dp"
-        android:contentDescription="@string/show_hints_and_solution"
+        android:contentDescription="@string/state_fragment_open_hint_content_description"
         app:srcCompat="@drawable/ic_hint_bulb_white_24dp" />
     </FrameLayout>
 
diff --git a/app/src/main/res/layout-land/resume_lesson_fragment.xml b/app/src/main/res/layout-land/resume_lesson_fragment.xml
index e317a2eff27..9b979deb475 100644
--- a/app/src/main/res/layout-land/resume_lesson_fragment.xml
+++ b/app/src/main/res/layout-land/resume_lesson_fragment.xml
@@ -80,7 +80,7 @@
           android:gravity="center"
           android:minWidth="144dp"
           android:minHeight="@dimen/clickable_item_min_height"
-          android:text="@string/start_over_lesson_button"
+          android:text="@string/resume_lessons_fragment_start_over_button_text"
           android:textAllCaps="false"
           android:textColor="@color/component_color_shared_secondary_button_background_trim_color"
           android:textSize="14sp"
@@ -99,7 +99,7 @@
           android:gravity="center"
           android:minWidth="144dp"
           android:minHeight="@dimen/clickable_item_min_height"
-          android:text="@string/resume_lesson_button"
+          android:text="@string/resume_lessons_fragment_continue_button_text"
           android:textAllCaps="false"
           android:textColor="@color/component_color_shared_secondary_4_text_color"
           android:textSize="14sp"
diff --git a/app/src/main/res/layout-land/story_chapter_view.xml b/app/src/main/res/layout-land/story_chapter_view.xml
index 6c40a6758a7..fc1064c2b45 100644
--- a/app/src/main/res/layout-land/story_chapter_view.xml
+++ b/app/src/main/res/layout-land/story_chapter_view.xml
@@ -92,7 +92,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"
-            android:contentDescription="@{@string/chapter_completed}"
+            android:contentDescription="@{@string/topic_fragment_lessons_chapter_completed_text}"
             android:visibility="@{viewModel.chapterSummary.chapterPlayState == ChapterPlayState.COMPLETED ? View.VISIBLE : View.GONE}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout-land/survey_fragment.xml b/app/src/main/res/layout-land/survey_fragment.xml
index d1358390ce6..21d8ef487cc 100644
--- a/app/src/main/res/layout-land/survey_fragment.xml
+++ b/app/src/main/res/layout-land/survey_fragment.xml
@@ -29,7 +29,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/component_color_shared_activity_toolbar_color"
-        android:contentDescription="@string/survey_exit_button_description"
+        android:contentDescription="@string/survey_activity_exit_dialog_exit_button_description"
         android:minHeight="?attr/actionBarSize"
         android:theme="@style/Widget.AppCompat.ActionBar"
         app:navigationIcon="@drawable/ic_close_white_24dp">
@@ -125,7 +125,7 @@
           style="@style/SurveyPreviousButton"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:text="@string/survey_previous_button"
+          android:text="@string/survey_fragment_previous_button"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toTopOf="parent" />
 
@@ -136,7 +136,7 @@
           android:layout_height="wrap_content"
           android:background="@{viewModel.canMoveToNextQuestion ? @drawable/state_button_primary_background : @drawable/state_button_inactive_background}"
           android:enabled="@{viewModel.canMoveToNextQuestion}"
-          android:text="@string/next"
+          android:text="@string/next_text"
           android:textColor="@{viewModel.canMoveToNextQuestion ? @color/component_color_shared_secondary_4_text_color : @color/component_color_survey_disabled_button_text_color}"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout-land/survey_welcome_dialog_fragment.xml b/app/src/main/res/layout-land/survey_welcome_dialog_fragment.xml
index 9a41b4cf558..86943c2ade3 100644
--- a/app/src/main/res/layout-land/survey_welcome_dialog_fragment.xml
+++ b/app/src/main/res/layout-land/survey_welcome_dialog_fragment.xml
@@ -9,7 +9,7 @@
     <TextView
       android:id="@+id/survey_onboarding_title_text"
       style="@style/SurveyPopupHeaderStyle"
-      android:text="@string/survey_onboarding_title_text"
+      android:text="@string/survey_activity_welcome_dialog_onboarding_title_text"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintBottom_toTopOf="@id/survey_onboarding_title_guide"
@@ -40,7 +40,7 @@
       style="@style/SurveyPopupMessageStyle"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
-      android:text="@string/survey_onboarding_message_text"
+      android:text="@string/survey_activity_exit_dialog_onboarding_text"
       app:layout_constraintTop_toTopOf="@id/survey_onboarding_center_guide" />
 
     <Button
@@ -48,7 +48,7 @@
       style="@style/SurveyPrimaryButton"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
-      android:text="@string/survey_begin_survey_button"
+      android:text="@string/survey_activity_welcome_dialog_begin_survey_button"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@id/survey_onboarding_text"
@@ -60,7 +60,7 @@
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/survey_navigation_buttons_margin"
-      android:text="@string/survey_maybe_later_button"
+      android:text="@string/survey_activity_welcome_dialog_maybe_later_button"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@id/begin_survey_button" />
diff --git a/app/src/main/res/layout-land/topic_info_fragment.xml b/app/src/main/res/layout-land/topic_info_fragment.xml
index 6ebd9c406d1..cc8336c870f 100644
--- a/app/src/main/res/layout-land/topic_info_fragment.xml
+++ b/app/src/main/res/layout-land/topic_info_fragment.xml
@@ -83,7 +83,7 @@
         android:minHeight="48dp"
         android:onClick="@{(v) -> viewModel.clickSeeMore()}"
         android:paddingTop="8dp"
-        android:text="@{viewModel.isDescriptionExpanded() ? @string/see_less : @string/see_more}"
+        android:text="@{viewModel.isDescriptionExpanded() ? @string/topic_fragment_info_see_less_text : @string/topic_fragment_info_see_more_text}"
         android:textColor="@color/component_color_shared_active_text_color"
         android:textSize="16sp"
         android:textStyle="bold"
@@ -106,7 +106,7 @@
         app:layout_constraintTop_toBottomOf="@+id/see_more_text_view"
         app:srcCompat="@{viewModel.downloadStatusIndicatorDrawableResourceId, default=@drawable/ic_available_offline_primary_24dp}"
         app:tint="@color/component_color_topic_info_fragment_download_status_image_color"
-        android:contentDescription="@string/download_status_image_content_description" />
+        android:contentDescription="@string/topic_fragment_info_download_status_image_description" />
 
       <TextView
         android:id="@+id/download_story_count_text_view"
@@ -115,7 +115,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
         android:fontFamily="sans-serif"
-        android:text="@string/topic_downloaded"
+        android:text="@string/topic_fragment_info_topic_downloaded"
         android:textColor="@color/component_color_shared_download_story_text_color"
         android:textSize="18sp"
         app:layout_constraintBottom_toBottomOf="@+id/download_status_image_view"
diff --git a/app/src/main/res/layout-land/walkthrough_final_fragment.xml b/app/src/main/res/layout-land/walkthrough_final_fragment.xml
index 4cc89c8fc26..65e311f5c10 100644
--- a/app/src/main/res/layout-land/walkthrough_final_fragment.xml
+++ b/app/src/main/res/layout-land/walkthrough_final_fragment.xml
@@ -56,7 +56,7 @@
           android:layout_height="wrap_content"
           android:layout_gravity="center_horizontal"
           android:fontFamily="sans-serif"
-          android:text="@string/no"
+          android:text="@string/walkthrough_activity_no_text"
           android:textColor="@color/component_color_shared_primary_text_color"
           android:textSize="20sp" />
 
@@ -67,7 +67,7 @@
           android:layout_gravity="center_horizontal"
           android:layout_marginTop="40dp"
           android:fontFamily="sans-serif"
-          android:text="@string/pick_a_different_topic"
+          android:text="@string/walkthrough_activity_pick_different_topic_text"
           android:textColor="@color/component_color_shared_primary_text_color"
           android:textSize="12sp" />
       </com.google.android.material.card.MaterialCardView>
@@ -89,7 +89,7 @@
           android:layout_height="wrap_content"
           android:layout_gravity="center_horizontal"
           android:fontFamily="sans-serif"
-          android:text="@string/yes"
+          android:text="@string/walkthrough_activity_yes_text"
           android:textColor="@color/component_color_shared_secondary_6_text_color"
           android:textSize="20sp" />
 
@@ -100,7 +100,7 @@
           android:layout_gravity="center_horizontal"
           android:layout_marginTop="40dp"
           android:fontFamily="sans-serif"
-          android:text="@string/lets_get_started"
+          android:text="@string/walkthrough_activity_get_started_text"
           android:textColor="@color/component_color_shared_secondary_6_text_color"
           android:textSize="12sp" />
       </com.google.android.material.card.MaterialCardView>
@@ -126,7 +126,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:fontFamily="sans-serif"
-      android:text="@string/great"
+      android:text="@string/walkthrough_activity_final_title_text"
       android:textColor="@color/component_color_shared_primary_text_color"
       android:textSize="24sp"
       app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout-land/walkthrough_welcome_fragment.xml b/app/src/main/res/layout-land/walkthrough_welcome_fragment.xml
index 06c4ed0447f..879b00a58bd 100644
--- a/app/src/main/res/layout-land/walkthrough_welcome_fragment.xml
+++ b/app/src/main/res/layout-land/walkthrough_welcome_fragment.xml
@@ -46,7 +46,7 @@
         android:layout_marginTop="16dp"
         android:layout_marginEnd="56dp"
         android:fontFamily="sans-serif"
-        android:text="@string/walkthrough_welcome_description"
+        android:text="@string/walkthrough_activity_welcome_description"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="20sp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -71,7 +71,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="12dp"
         android:onClick="@{(v) -> presenter.changePage()}"
-        android:text="@string/next"
+        android:text="@string/next_text"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/walkthrough_welcome_image_view"
diff --git a/app/src/main/res/layout-sw600dp-land/faq_single_activity.xml b/app/src/main/res/layout-sw600dp-land/faq_single_activity.xml
index 1c8f2e70045..49e55f6563e 100644
--- a/app/src/main/res/layout-sw600dp-land/faq_single_activity.xml
+++ b/app/src/main/res/layout-sw600dp-land/faq_single_activity.xml
@@ -23,7 +23,7 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator"
         app:titleTextAppearance="@style/ToolbarTextAppearance" />
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout-sw600dp-land/onboarding_fragment.xml b/app/src/main/res/layout-sw600dp-land/onboarding_fragment.xml
index 4899d438355..7ed723095cf 100644
--- a/app/src/main/res/layout-sw600dp-land/onboarding_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-land/onboarding_fragment.xml
@@ -69,7 +69,7 @@
         android:layout_marginTop="12dp"
         android:layout_marginEnd="32dp"
         android:layout_marginBottom="12dp"
-        android:contentDescription="@string/next_arrow"
+        android:contentDescription="@string/onboarding_activity_next_arrow_text"
         android:gravity="center"
         android:minWidth="48dp"
         android:minHeight="48dp"
@@ -89,7 +89,7 @@
         android:minWidth="48dp"
         android:minHeight="48dp"
         android:onClick="@{(v) -> presenter.clickOnSkip()}"
-        android:text="@string/skip"
+        android:text="@string/onboarding_activity_skip_text"
         android:textAllCaps="true"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:visibility="@{viewModel.slideNumber != (viewModel.totalNumberOfSlides - 1) ? View.VISIBLE: View.GONE, default=visible}"
diff --git a/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml b/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml
index b33f3480486..1d9134137bb 100644
--- a/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml
+++ b/app/src/main/res/layout-sw600dp-land/onboarding_slide_final.xml
@@ -41,7 +41,7 @@
         android:layout_width="0dp"
         android:layout_marginBottom="12dp"
         android:fontFamily="sans-serif-medium"
-        android:text="@string/onboarding_slide_3_title"
+        android:text="@string/onboarding_activity_slide_3_title"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="32sp"
         app:layout_constraintBottom_toTopOf="@+id/guideline2"
@@ -54,7 +54,7 @@
         style="@style/Subtitle1ViewCenterHorizontal"
         android:layout_width="0dp"
         android:layout_marginTop="12dp"
-        android:text="@string/onboarding_slide_3_description"
+        android:text="@string/onboarding_activity_slide_3_description"
         android:textColor="@color/component_color_shared_secondary_1_text_color"
         android:textSize="24sp"
         app:layout_constraintEnd_toStartOf="@+id/guideline3"
@@ -70,7 +70,7 @@
         android:fontFamily="sans-serif-medium"
         android:minHeight="48dp"
         android:onClick="@{(v) -> viewModel.clickOnGetStarted()}"
-        android:text="@string/get_started"
+        android:text="@string/onboarding_activity_get_started_text"
         android:textColor="@color/component_color_shared_secondary_4_text_color"
         android:textSize="14sp"
         android:textAllCaps="false"
diff --git a/app/src/main/res/layout-sw600dp-land/profile_chooser_add_view.xml b/app/src/main/res/layout-sw600dp-land/profile_chooser_add_view.xml
index b4fe8b3ba79..bf9235861f9 100644
--- a/app/src/main/res/layout-sw600dp-land/profile_chooser_add_view.xml
+++ b/app/src/main/res/layout-sw600dp-land/profile_chooser_add_view.xml
@@ -59,7 +59,7 @@
         <TextView
           android:id="@+id/add_profile_text"
           style="@style/Caption"
-          android:text="@{hasProfileEverBeenAddedValue ? @string/profile_chooser_add : @string/set_up_multiple_profiles}"
+          android:text="@{hasProfileEverBeenAddedValue ? @string/profile_chooser_fragment_add_text : @string/profile_chooser_fragment_set_up_multiple_profiles}"
           android:textColor="@color/component_color_shared_secondary_4_text_color"
           android:textSize="20sp" />
 
@@ -69,7 +69,7 @@
           android:layout_gravity="center"
           android:layout_marginTop="4dp"
           android:fontFamily="sans-serif"
-          android:text="@string/set_up_multiple_profiles_description"
+          android:text="@string/profile_chooser_fragment_add_profile_description_text"
           android:textColor="@color/component_color_shared_secondary_4_text_color"
           android:textSize="16sp"
           android:visibility="@{hasProfileEverBeenAddedValue ? View.GONE : View.VISIBLE}" />
diff --git a/app/src/main/res/layout-sw600dp-land/profile_chooser_profile_view.xml b/app/src/main/res/layout-sw600dp-land/profile_chooser_profile_view.xml
index f70c2bbf2fa..9b27b150db0 100644
--- a/app/src/main/res/layout-sw600dp-land/profile_chooser_profile_view.xml
+++ b/app/src/main/res/layout-sw600dp-land/profile_chooser_profile_view.xml
@@ -90,7 +90,7 @@
           android:layout_height="wrap_content"
           android:layout_marginTop="4dp"
           android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}"
-          android:text="@string/profile_chooser_admin"
+          android:text="@string/profile_chooser_fragment_admin_text"
           android:textColor="@color/component_color_shared_secondary_4_text_color"
           android:visibility="@{viewModel.profile.isAdmin ? View.VISIBLE : View.GONE}"
           app:layoutMarginTop="@{hasProfileEverBeenAddedValue ? @dimen/profile_chooser_profile_view_is_admin_margin_top_profile_already_added : @dimen/space_0dp}" />
diff --git a/app/src/main/res/layout-sw600dp-land/question_player_fragment.xml b/app/src/main/res/layout-sw600dp-land/question_player_fragment.xml
index c720268b937..1954f8b05a4 100644
--- a/app/src/main/res/layout-sw600dp-land/question_player_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-land/question_player_fragment.xml
@@ -29,7 +29,7 @@
         android:layout_marginTop="40dp"
         android:layout_marginEnd="192dp"
         android:fontFamily="sans-serif"
-        android:text="@string/question_training_session_finished_header"
+        android:text="@string/topic_fragment_question_end_session_header_text"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="24sp"
         android:visibility="gone"
@@ -44,7 +44,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="192dp"
         android:fontFamily="sans-serif"
-        android:text="@string/question_training_session_finished_message"
+        android:text="@string/topic_fragment_question_end_session_body_text"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="16sp"
         android:visibility="gone"
@@ -151,7 +151,7 @@
         android:layout_height="6dp"
         android:layout_gravity="top|end"
         android:layout_margin="8dp"
-        android:contentDescription="@string/new_hint_available"
+        android:contentDescription="@string/question_player_activity_new_hint_available_text"
         android:visibility="@{viewModel.isHintOpenedAndUnRevealed() ? View.VISIBLE : View.GONE}"
         app:srcCompat="@drawable/ic_dot_yellow_24dp" />
 
@@ -160,7 +160,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="12dp"
-        android:contentDescription="@string/show_hints_and_solution"
+        android:contentDescription="@string/state_fragment_open_hint_content_description"
         app:srcCompat="@drawable/ic_hint_bulb_white_24dp" />
     </FrameLayout>
 
diff --git a/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml b/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml
index 5997f1069a4..0295e092bd8 100644
--- a/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-land/resume_lesson_fragment.xml
@@ -110,7 +110,7 @@
             android:gravity="center"
             android:minWidth="144dp"
             android:minHeight="@dimen/clickable_item_min_height"
-            android:text="@string/start_over_lesson_button"
+            android:text="@string/resume_lessons_fragment_start_over_button_text"
             android:textAllCaps="false"
             android:textColor="@color/component_color_shared_secondary_button_background_trim_color"
             android:textSize="14sp"
@@ -129,7 +129,7 @@
             android:gravity="center"
             android:minWidth="144dp"
             android:minHeight="@dimen/clickable_item_min_height"
-            android:text="@string/resume_lesson_button"
+            android:text="@string/resume_lessons_fragment_continue_button_text"
             android:textAllCaps="false"
             android:textColor="@color/component_color_shared_secondary_4_text_color"
             android:textSize="14sp"
diff --git a/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml b/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml
index 2f4129184af..5e28f76167e 100644
--- a/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-land/topic_info_fragment.xml
@@ -79,7 +79,7 @@
           android:minHeight="48dp"
           android:onClick="@{(v) -> viewModel.clickSeeMore()}"
           android:paddingTop="8dp"
-          android:text="@{viewModel.isDescriptionExpanded() ? @string/see_less : @string/see_more}"
+          android:text="@{viewModel.isDescriptionExpanded() ? @string/topic_fragment_info_see_less_text : @string/topic_fragment_info_see_more_text}"
           android:textColor="@color/component_color_shared_active_text_color"
           android:textSize="16sp"
           android:textStyle="bold"
@@ -100,7 +100,7 @@
           app:layout_constraintTop_toBottomOf="@+id/see_more_text_view"
           app:srcCompat="@{viewModel.downloadStatusIndicatorDrawableResourceId, default=@drawable/ic_available_offline_primary_24dp}"
           app:tint="@color/component_color_topic_info_fragment_download_status_image_color"
-          android:contentDescription="@string/download_status_image_content_description" />
+          android:contentDescription="@string/topic_fragment_info_download_status_image_description" />
 
         <TextView
           android:id="@+id/download_story_count_text_view"
@@ -109,7 +109,7 @@
           android:layout_height="wrap_content"
           android:layout_marginStart="12dp"
           android:fontFamily="sans-serif"
-          android:text="@string/topic_downloaded"
+          android:text="@string/topic_fragment_info_topic_downloaded"
           android:textColor="@color/component_color_shared_download_story_text_color"
           android:textSize="18sp"
           app:layout_constraintBottom_toBottomOf="@+id/download_status_image_view"
diff --git a/app/src/main/res/layout-sw600dp-land/topic_lessons_story_summary.xml b/app/src/main/res/layout-sw600dp-land/topic_lessons_story_summary.xml
index b4467458dcd..c950c13f00c 100644
--- a/app/src/main/res/layout-sw600dp-land/topic_lessons_story_summary.xml
+++ b/app/src/main/res/layout-sw600dp-land/topic_lessons_story_summary.xml
@@ -84,7 +84,7 @@
               android:layout_height="wrap_content"
               android:layout_marginTop="4dp"
               android:fontFamily="sans-serif"
-              android:text="@{viewModel.storyPercentage != 100? @string/status_in_progress : @string/status_completed}"
+              android:text="@{viewModel.storyPercentage != 100? @string/topic_fragment_lessons_story_status_in_progress : @string/topic_fragment_lessons_story_status_completed}"
               android:textColor="@color/component_color_shared_primary_text_color"
               android:textSize="10sp"
               android:visibility="@{viewModel.storyPercentage != 0 ? View.VISIBLE : View.GONE}" />
@@ -142,7 +142,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal|bottom"
-                android:contentDescription="@{isListExpanded ? @string/hide_chapter_list : @string/show_chapter_list}"
+                android:contentDescription="@{isListExpanded ? @string/topic_fragment_lessons_hide_chapter_list : @string/topic_fragment_lessons_show_chapter_list}"
                 app:isRotationAnimationClockwise="@{isListExpanded}"
                 app:rotationAnimationAngle="@{180f}"
                 app:srcCompat="@drawable/ic_arrow_drop_down_black_24dp"
diff --git a/app/src/main/res/layout-sw600dp-port/onboarding_fragment.xml b/app/src/main/res/layout-sw600dp-port/onboarding_fragment.xml
index 18b1555cbcc..6182a571f23 100644
--- a/app/src/main/res/layout-sw600dp-port/onboarding_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-port/onboarding_fragment.xml
@@ -68,7 +68,7 @@
         android:layout_marginTop="12dp"
         android:layout_marginEnd="32dp"
         android:layout_marginBottom="12dp"
-        android:contentDescription="@string/next_arrow"
+        android:contentDescription="@string/onboarding_activity_next_arrow_text"
         android:gravity="center"
         android:minWidth="48dp"
         android:minHeight="48dp"
@@ -89,7 +89,7 @@
         android:minWidth="48dp"
         android:minHeight="48dp"
         android:onClick="@{(v) -> presenter.clickOnSkip()}"
-        android:text="@string/skip"
+        android:text="@string/onboarding_activity_skip_text"
         android:textAllCaps="true"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:visibility="@{viewModel.slideNumber != (viewModel.totalNumberOfSlides - 1) ? View.VISIBLE: View.GONE, default=visible}"
diff --git a/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml b/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml
index 7d56635942f..8499020e970 100644
--- a/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml
+++ b/app/src/main/res/layout-sw600dp-port/onboarding_slide_final.xml
@@ -43,7 +43,7 @@
         android:layout_marginEnd="160dp"
         android:fontFamily="sans-serif-medium"
         android:gravity="center_horizontal"
-        android:text="@string/onboarding_slide_3_title"
+        android:text="@string/onboarding_activity_slide_3_title"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="32sp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -59,7 +59,7 @@
         android:layout_marginEnd="192dp"
         android:maxLines="2"
         android:minLines="2"
-        android:text="@string/onboarding_slide_3_description"
+        android:text="@string/onboarding_activity_slide_3_description"
         android:textColor="@color/component_color_shared_secondary_1_text_color"
         android:textSize="24sp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -77,7 +77,7 @@
         android:fontFamily="sans-serif-medium"
         android:minHeight="48dp"
         android:onClick="@{(v) -> viewModel.clickOnGetStarted()}"
-        android:text="@string/get_started"
+        android:text="@string/onboarding_activity_get_started_text"
         android:textColor="@color/component_color_shared_secondary_4_text_color"
         android:textSize="20sp"
         android:textAllCaps="false"
diff --git a/app/src/main/res/layout-sw600dp-port/profile_chooser_add_view.xml b/app/src/main/res/layout-sw600dp-port/profile_chooser_add_view.xml
index af4cad46d7c..57353dea378 100644
--- a/app/src/main/res/layout-sw600dp-port/profile_chooser_add_view.xml
+++ b/app/src/main/res/layout-sw600dp-port/profile_chooser_add_view.xml
@@ -58,7 +58,7 @@
         <TextView
           android:id="@+id/add_profile_text"
           style="@style/Caption"
-          android:text="@{hasProfileEverBeenAddedValue ? @string/profile_chooser_add : @string/set_up_multiple_profiles}"
+          android:text="@{hasProfileEverBeenAddedValue ? @string/profile_chooser_fragment_add_text : @string/profile_chooser_fragment_set_up_multiple_profiles}"
           android:textColor="@color/component_color_shared_secondary_4_text_color"
           android:textSize="20sp" />
 
@@ -68,7 +68,7 @@
           android:layout_gravity="center"
           android:layout_marginTop="4dp"
           android:fontFamily="sans-serif"
-          android:text="@string/set_up_multiple_profiles_description"
+          android:text="@string/profile_chooser_fragment_add_profile_description_text"
           android:textColor="@color/component_color_shared_secondary_4_text_color"
           android:textSize="16sp"
           android:visibility="@{hasProfileEverBeenAddedValue ? View.GONE : View.VISIBLE}" />
diff --git a/app/src/main/res/layout-sw600dp-port/profile_chooser_profile_view.xml b/app/src/main/res/layout-sw600dp-port/profile_chooser_profile_view.xml
index 969ca5372d8..e5d691dc417 100644
--- a/app/src/main/res/layout-sw600dp-port/profile_chooser_profile_view.xml
+++ b/app/src/main/res/layout-sw600dp-port/profile_chooser_profile_view.xml
@@ -89,7 +89,7 @@
           android:layout_height="wrap_content"
           android:layout_marginTop="4dp"
           android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}"
-          android:text="@string/profile_chooser_admin"
+          android:text="@string/profile_chooser_fragment_admin_text"
           android:textColor="@color/component_color_shared_secondary_4_text_color"
           android:visibility="@{viewModel.profile.isAdmin ? View.VISIBLE : View.GONE}" />
       </LinearLayout>
diff --git a/app/src/main/res/layout-sw600dp-port/question_player_fragment.xml b/app/src/main/res/layout-sw600dp-port/question_player_fragment.xml
index 760a1e8c305..1f8fd6426d2 100644
--- a/app/src/main/res/layout-sw600dp-port/question_player_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-port/question_player_fragment.xml
@@ -29,7 +29,7 @@
         android:layout_marginTop="40dp"
         android:layout_marginEnd="128dp"
         android:fontFamily="sans-serif"
-        android:text="@string/question_training_session_finished_header"
+        android:text="@string/topic_fragment_question_end_session_header_text"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="24sp"
         android:visibility="gone"
@@ -44,7 +44,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="128dp"
         android:fontFamily="sans-serif"
-        android:text="@string/question_training_session_finished_message"
+        android:text="@string/topic_fragment_question_end_session_body_text"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="16sp"
         android:visibility="gone"
@@ -151,7 +151,7 @@
         android:layout_height="6dp"
         android:layout_gravity="top|end"
         android:layout_margin="8dp"
-        android:contentDescription="@string/new_hint_available"
+        android:contentDescription="@string/question_player_activity_new_hint_available_text"
         android:visibility="@{viewModel.isHintOpenedAndUnRevealed() ? View.VISIBLE : View.GONE}"
         app:srcCompat="@drawable/ic_dot_yellow_24dp" />
 
@@ -160,7 +160,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="12dp"
-        android:contentDescription="@string/show_hints_and_solution"
+        android:contentDescription="@string/state_fragment_open_hint_content_description"
         app:srcCompat="@drawable/ic_hint_bulb_white_24dp" />
     </FrameLayout>
 
diff --git a/app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml b/app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml
index 44454b975c0..1a1d6f19d45 100644
--- a/app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-port/resume_lesson_fragment.xml
@@ -95,7 +95,7 @@
           android:gravity="center"
           android:minWidth="144dp"
           android:minHeight="@dimen/clickable_item_min_height"
-          android:text="@string/start_over_lesson_button"
+          android:text="@string/resume_lessons_fragment_start_over_button_text"
           android:textAllCaps="false"
           android:textColor="@color/component_color_shared_secondary_button_background_trim_color"
           android:textSize="14sp"
@@ -113,7 +113,7 @@
           android:gravity="center"
           android:minWidth="144dp"
           android:minHeight="@dimen/clickable_item_min_height"
-          android:text="@string/resume_lesson_button"
+          android:text="@string/resume_lessons_fragment_continue_button_text"
           android:textAllCaps="false"
           android:textColor="@color/component_color_shared_secondary_4_text_color"
           android:textSize="14sp"
diff --git a/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml b/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml
index e683f6b64e3..ec4f23ff187 100644
--- a/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml
+++ b/app/src/main/res/layout-sw600dp-port/topic_info_fragment.xml
@@ -100,7 +100,7 @@
         android:minHeight="48dp"
         android:onClick="@{(v) -> viewModel.clickSeeMore()}"
         android:paddingTop="8dp"
-        android:text="@{viewModel.isDescriptionExpanded() ? @string/see_less : @string/see_more}"
+        android:text="@{viewModel.isDescriptionExpanded() ? @string/topic_fragment_info_see_less_text : @string/topic_fragment_info_see_more_text}"
         android:textColor="@color/component_color_shared_active_text_color"
         android:textSize="16sp"
         android:textStyle="bold"
@@ -120,7 +120,7 @@
         app:layout_constraintTop_toBottomOf="@+id/see_more_text_view"
         app:srcCompat="@{viewModel.downloadStatusIndicatorDrawableResourceId, default=@drawable/ic_available_offline_primary_24dp}"
         app:tint="@color/component_color_topic_info_fragment_download_status_image_color"
-        android:contentDescription="@string/download_status_image_content_description" />
+        android:contentDescription="@string/topic_fragment_info_download_status_image_description" />
 
       <TextView
         android:id="@+id/download_story_count_text_view"
@@ -129,7 +129,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
         android:fontFamily="sans-serif"
-        android:text="@string/topic_downloaded"
+        android:text="@string/topic_fragment_info_topic_downloaded"
         android:textColor="@color/component_color_shared_download_story_text_color"
         android:textSize="18sp"
         app:layout_constraintBottom_toBottomOf="@+id/download_status_image_view"
diff --git a/app/src/main/res/layout-sw600dp/administrator_controls_app_information_view.xml b/app/src/main/res/layout-sw600dp/administrator_controls_app_information_view.xml
index 8f676cd9c56..e7e7eeacd2c 100644
--- a/app/src/main/res/layout-sw600dp/administrator_controls_app_information_view.xml
+++ b/app/src/main/res/layout-sw600dp/administrator_controls_app_information_view.xml
@@ -26,7 +26,7 @@
       android:paddingTop="28dp"
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_app_information_label"
+      android:text="@string/administrator_controls_fragment_app_information_text"
       android:textColor="@color/component_color_shared_active_text_color"
       app:layout_constraintBottom_toTopOf="@id/app_version_text_view"
       app:layout_constraintEnd_toEndOf="parent"
@@ -43,7 +43,7 @@
       android:paddingTop="20dp"
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_app_version"
+      android:text="@string/administrator_controls_fragment_app_version_text"
       android:textColor="@color/component_color_shared_primary_dark_text_color"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout-sw600dp/administrator_controls_learner_analytics_view.xml b/app/src/main/res/layout-sw600dp/administrator_controls_learner_analytics_view.xml
index a9ba3c2c885..2acbc4d2743 100644
--- a/app/src/main/res/layout-sw600dp/administrator_controls_learner_analytics_view.xml
+++ b/app/src/main/res/layout-sw600dp/administrator_controls_learner_analytics_view.xml
@@ -26,7 +26,7 @@
       android:paddingTop="28dp"
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
-      android:text="@string/learner_analytics_label_text"
+      android:text="@string/administrator_controls_activity_learner_analytics_text"
       android:textColor="@color/component_color_shared_active_text_color"
       app:layout_constraintBottom_toTopOf="@id/profile_and_device_id_text_view"
       app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout-sw600dp/administrator_controls_profile_view.xml b/app/src/main/res/layout-sw600dp/administrator_controls_profile_view.xml
index b0230632aea..ef0a8d95f1c 100644
--- a/app/src/main/res/layout-sw600dp/administrator_controls_profile_view.xml
+++ b/app/src/main/res/layout-sw600dp/administrator_controls_profile_view.xml
@@ -26,7 +26,7 @@
       android:paddingTop="28dp"
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_profile_management_label"
+      android:text="@string/administrator_controls_fragment_profile_management_label"
       android:textColor="@color/component_color_shared_active_text_color"
       app:layout_constraintBottom_toTopOf="@id/edit_profiles_text_view"
       app:layout_constraintEnd_toEndOf="parent"
@@ -43,7 +43,7 @@
       android:paddingTop="20dp"
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_edit_profiles"
+      android:text="@string/administrator_controls_fragment_edit_profiles_text"
       android:textColor="@color/component_color_shared_primary_dark_text_color"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout-sw600dp/option_app_language.xml b/app/src/main/res/layout-sw600dp/option_app_language.xml
index 0a14584f377..74429000c94 100644
--- a/app/src/main/res/layout-sw600dp/option_app_language.xml
+++ b/app/src/main/res/layout-sw600dp/option_app_language.xml
@@ -31,7 +31,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:fontFamily="sans-serif"
-      android:text="@string/app_language"
+      android:text="@string/option_activity_app_language_text"
       android:textColor="@color/component_color_shared_primary_dark_text_color"
       android:textSize="16sp"
       app:layout_constraintBottom_toTopOf="@id/app_language_text_view"
diff --git a/app/src/main/res/layout-sw600dp/option_story_text_size.xml b/app/src/main/res/layout-sw600dp/option_story_text_size.xml
index 0857ba8b4ca..b6fc4049520 100644
--- a/app/src/main/res/layout-sw600dp/option_story_text_size.xml
+++ b/app/src/main/res/layout-sw600dp/option_story_text_size.xml
@@ -31,7 +31,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:fontFamily="sans-serif"
-      android:text="@string/reading_text_size"
+      android:text="@string/option_activity_reading_text_size"
       android:textColor="@color/component_color_shared_primary_dark_text_color"
       android:textSize="16sp"
       app:layout_constraintBottom_toTopOf="@id/reading_text_size_text_view"
diff --git a/app/src/main/res/layout-sw600dp/profile_chooser_fragment.xml b/app/src/main/res/layout-sw600dp/profile_chooser_fragment.xml
index e1cda79e5df..788bfabeada 100644
--- a/app/src/main/res/layout-sw600dp/profile_chooser_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/profile_chooser_fragment.xml
@@ -41,13 +41,13 @@
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintTop_toTopOf="parent"
           app:srcCompat="@drawable/ic_language_icon_grey_24dp"
-          android:contentDescription="@string/language_icon_content_description" />
+          android:contentDescription="@string/profile_chooser_fragment_language_icon_description" />
 
         <TextView
           style="@style/Subtitle1ViewCenter"
           android:minHeight="48dp"
           android:paddingTop="20dp"
-          android:text="@string/profile_chooser_language"
+          android:text="@string/profile_chooser_fragment_language_text"
           android:textColor="@color/component_color_profile_chooser_activity_secondary_options_color"
           android:visibility="gone"
           app:layout_constraintEnd_toStartOf="@+id/profile_chooser_language_icon"
@@ -60,7 +60,7 @@
           android:layout_marginStart="@dimen/profile_chooser_profile_select_text_margin_start"
           android:layout_marginTop="80dp"
           android:fontFamily="sans-serif"
-          android:text="@string/profile_chooser_select"
+          android:text="@string/profile_chooser_fragment_select_text"
           android:textColor="@color/component_color_shared_secondary_4_text_color"
           android:textSize="36sp"
           app:layout_constraintStart_toStartOf="parent"
@@ -111,7 +111,7 @@
         style="@style/Heading1ViewCenter"
         android:layout_marginBottom="@dimen/profile_chooser_administrator_controls_margin_bottom"
         android:minHeight="48dp"
-        android:text="@string/profile_chooser_administrator_controls"
+        android:text="@string/profile_chooser_fragment_administrator_controls_text"
         android:textColor="@color/component_color_profile_chooser_activity_secondary_options_color" />
 
       <ImageView
@@ -121,7 +121,7 @@
         android:layout_marginEnd="@dimen/profile_chooser_setting_icon_margin_end"
         android:padding="8dp"
         app:srcCompat="@drawable/ic_settings_grey_48dp"
-        android:contentDescription="@string/setting_icon_content_description" />
+        android:contentDescription="@string/profile_chooser_fragment_setting_icon_description" />
     </LinearLayout>
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout-sw600dp/profile_progress_header.xml b/app/src/main/res/layout-sw600dp/profile_progress_header.xml
index 9ca97de20d1..9f0e1dab9dc 100644
--- a/app/src/main/res/layout-sw600dp/profile_progress_header.xml
+++ b/app/src/main/res/layout-sw600dp/profile_progress_header.xml
@@ -24,7 +24,7 @@
       android:layout_height="160dp"
       android:layout_marginStart="@dimen/profile_edit_image_layout_margin_start"
       android:clickable="true"
-      android:contentDescription="@string/current_profile_picture_content_description"
+      android:contentDescription="@string/add_profile_activity_edit_image_content_description"
       android:elevation="4dp"
       android:focusable="true"
       android:onClick="@{() -> viewModel.clickOnProfilePicture()}"
@@ -38,7 +38,7 @@
     <ImageView
       android:layout_width="56dp"
       android:layout_height="56dp"
-      android:contentDescription="@string/edit_profile_picture_content_description"
+      android:contentDescription="@string/add_profile_activity_edit_user_image_content_description"
       android:elevation="4dp"
       android:onClick="@{() -> viewModel.clickOnProfilePicture()}"
       android:paddingStart="12dp"
@@ -108,7 +108,7 @@
           android:layout_width="60dp"
           android:layout_height="wrap_content"
           android:fontFamily="sans-serif"
-          android:text="@{viewModel.ongoingTopicCount != 1 ? @string/topics_in_progress : @string/topic_in_progress}"
+          android:text="@{viewModel.ongoingTopicCount != 1 ? @string/profile_progress_activity_topics_in_progress_text : @string/profile_progress_activity_topic_in_progress_text}"
           android:textColor="@color/component_color_shared_primary_text_color"
           android:textSize="12sp" />
       </LinearLayout>
@@ -157,7 +157,7 @@
           android:layout_width="60dp"
           android:layout_height="wrap_content"
           android:fontFamily="sans-serif"
-          android:text="@{viewModel.completedStoryCount != 1 ? @string/stories_completed : @string/story_completed}"
+          android:text="@{viewModel.completedStoryCount != 1 ? @string/profile_progress_activity_stories_completed_text : @string/profile_progress_activity_story_completed_text}"
           android:textColor="@color/component_color_shared_primary_text_color"
           android:textSize="12sp" />
       </LinearLayout>
@@ -172,7 +172,7 @@
       android:layout_marginTop="76dp"
       android:fontFamily="sans-serif-medium"
       android:minHeight="48dp"
-      android:text="@string/recently_played_stories"
+      android:text="@string/home_activity_recently_played_stories"
       android:textColor="@color/component_color_shared_primary_text_color"
       android:textSize="18sp"
       android:visibility="@{viewModel.headerTextVisibility}"
@@ -190,7 +190,7 @@
       android:gravity="center_vertical"
       android:minHeight="48dp"
       android:onClick="@{() -> viewModel.clickOnViewAll()}"
-      android:text="@string/view_all"
+      android:text="@string/home_activity_view_all_text"
       android:textAllCaps="true"
       android:textColor="@color/component_color_profile_progress_activity_view_all_text_color"
       android:textSize="14sp"
diff --git a/app/src/main/res/layout-sw600dp/revision_card_fragment.xml b/app/src/main/res/layout-sw600dp/revision_card_fragment.xml
index 2aa0649856d..6b2b8adad54 100644
--- a/app/src/main/res/layout-sw600dp/revision_card_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/revision_card_fragment.xml
@@ -50,7 +50,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="28dp"
             android:layout_marginEnd="28dp"
-            android:text="@string/revision_navigation_cards_header"
+            android:text="@string/revision_card_fragment_continue_studying_text"
             android:textAlignment="@{viewModel.subtopicId == 1 ? View.TEXT_ALIGNMENT_TEXT_END : View.TEXT_ALIGNMENT_TEXT_START}"
             android:textColor="@color/component_color_shared_primary_text_color"
             android:textSize="20sp"
diff --git a/app/src/main/res/layout-sw600dp/story_chapter_view.xml b/app/src/main/res/layout-sw600dp/story_chapter_view.xml
index 64800254214..04e7a50f255 100644
--- a/app/src/main/res/layout-sw600dp/story_chapter_view.xml
+++ b/app/src/main/res/layout-sw600dp/story_chapter_view.xml
@@ -116,7 +116,7 @@
             app:layout_constraintStart_toStartOf="@id/chapter_thumbnail"
             app:layout_constraintTop_toTopOf="@id/chapter_thumbnail"
             app:srcCompat="@drawable/ic_baseline_lock_24"
-            android:contentDescription="@string/lock_icon_content_description" />
+            android:contentDescription="@string/story_fragment_lock_icon_content_description" />
 
           <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -166,7 +166,7 @@
               android:layout_height="wrap_content"
               android:layout_marginEnd="8dp"
               android:layout_marginBottom="4dp"
-              android:contentDescription="@{@string/chapter_completed}"
+              android:contentDescription="@{@string/topic_fragment_lessons_chapter_completed_text}"
               android:visibility="@{viewModel.chapterSummary.chapterPlayState == ChapterPlayState.COMPLETED ? View.VISIBLE : View.GONE}"
               app:layout_constraintBottom_toBottomOf="parent"
               app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout-sw600dp/story_fragment.xml b/app/src/main/res/layout-sw600dp/story_fragment.xml
index 1c4a22acad5..a5f6b88eb0a 100644
--- a/app/src/main/res/layout-sw600dp/story_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/story_fragment.xml
@@ -33,7 +33,7 @@
         android:gravity="center_vertical"
         android:minHeight="?attr/actionBarSize"
         android:theme="@style/Widget.AppCompat.ActionBar"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator">
 
         <TextView
diff --git a/app/src/main/res/layout-sw600dp/topic_lessons_title.xml b/app/src/main/res/layout-sw600dp/topic_lessons_title.xml
index 51e44a66950..a461a995d04 100644
--- a/app/src/main/res/layout-sw600dp/topic_lessons_title.xml
+++ b/app/src/main/res/layout-sw600dp/topic_lessons_title.xml
@@ -20,6 +20,6 @@
       style="@style/Heading2ViewStart"
       android:layout_width="528dp"
       android:layout_gravity="center"
-      android:text="@string/stories_you_can_play" />
+      android:text="@string/home_activity_topic_play_text" />
   </FrameLayout>
 </layout>
diff --git a/app/src/main/res/layout-w600dp/survey_welcome_dialog_fragment.xml b/app/src/main/res/layout-w600dp/survey_welcome_dialog_fragment.xml
index d140d187690..4b90fe35343 100644
--- a/app/src/main/res/layout-w600dp/survey_welcome_dialog_fragment.xml
+++ b/app/src/main/res/layout-w600dp/survey_welcome_dialog_fragment.xml
@@ -9,7 +9,7 @@
     <TextView
       android:id="@+id/survey_onboarding_title_text"
       style="@style/SurveyPopupHeaderStyle"
-      android:text="@string/survey_onboarding_title_text"
+      android:text="@string/survey_activity_welcome_dialog_onboarding_title_text"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintBottom_toTopOf="@id/survey_onboarding_title_guide"
@@ -40,7 +40,7 @@
       style="@style/SurveyPopupMessageStyle"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
-      android:text="@string/survey_onboarding_message_text"
+      android:text="@string/survey_activity_exit_dialog_onboarding_text"
       app:layout_constraintTop_toTopOf="@id/survey_onboarding_center_guide" />
 
     <Button
@@ -48,7 +48,7 @@
       style="@style/SurveyPrimaryButton"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
-      android:text="@string/survey_begin_survey_button"
+      android:text="@string/survey_activity_welcome_dialog_begin_survey_button"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@id/survey_onboarding_text"
@@ -60,7 +60,7 @@
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/survey_navigation_buttons_margin"
-      android:text="@string/survey_maybe_later_button"
+      android:text="@string/survey_activity_welcome_dialog_maybe_later_button"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@id/begin_survey_button" />
diff --git a/app/src/main/res/layout/activity_input_interaction_view_test.xml b/app/src/main/res/layout/activity_input_interaction_view_test.xml
index dba00bfb1e8..6c4eda71844 100644
--- a/app/src/main/res/layout/activity_input_interaction_view_test.xml
+++ b/app/src/main/res/layout/activity_input_interaction_view_test.xml
@@ -122,7 +122,7 @@
         android:layout_margin="8dp"
         android:background="@drawable/edit_text_background"
         android:focusable="true"
-        android:hint="@string/test_number_input_interaction_hint"
+        android:hint="@string/input_interaction_view_test_activity_number_input_hint"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textColorHint="@color/component_color_shared_edit_text_hint_color"
         android:longClickable="false"
@@ -154,7 +154,7 @@
         android:layout_margin="8dp"
         android:background="@drawable/edit_text_background"
         android:focusable="true"
-        android:hint="@string/test_text_input_interaction_hint"
+        android:hint="@string/input_interaction_view_test_activity_text_input_hint"
         android:inputType="text"
         android:longClickable="false"
         android:maxLength="200"
@@ -181,7 +181,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:onClick="getPendingAnswerErrorOnSubmitClick"
-        android:text="@string/submit_button_text"
+        android:text="@string/input_interaction_view_test_activity_submit_button"
         android:textColor="@color/component_color_shared_secondary_4_text_color" />
     </LinearLayout>
   </ScrollView>
diff --git a/app/src/main/res/layout/add_profile_activity.xml b/app/src/main/res/layout/add_profile_activity.xml
index a3c2adc51e9..e390eb9f125 100644
--- a/app/src/main/res/layout/add_profile_activity.xml
+++ b/app/src/main/res/layout/add_profile_activity.xml
@@ -49,7 +49,7 @@
             android:layout_width="120dp"
             android:layout_height="120dp"
             android:clickable="true"
-            android:contentDescription="@string/current_profile_picture_content_description"
+            android:contentDescription="@string/add_profile_activity_edit_image_content_description"
             android:elevation="4dp"
             android:focusable="true"
             app:add_shadow="true"
@@ -64,7 +64,7 @@
             android:id="@+id/add_profile_activity_edit_user_image_view"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:contentDescription="@string/edit_profile_picture_content_description"
+            android:contentDescription="@string/add_profile_activity_edit_user_image_content_description"
             android:elevation="4dp"
             android:paddingStart="12dp"
             android:paddingEnd="0dp"
@@ -79,9 +79,9 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:hint="@string/add_profile_input_name"
+            android:hint="@string/add_profile_activity_input_name_hint"
             app:errorMessage="@{viewModel.nameErrorMsg}"
-            app:helperText="@string/add_profile_required"
+            app:helperText="@string/add_profile_activity_user_name_helper_text"
             app:helperTextEnabled="true"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -105,7 +105,7 @@
             android:layout_marginTop="@dimen/add_profile_pin_checkbox_margin_top"
             android:buttonTint="@color/component_color_shared_checkbox_selector"
             android:minHeight="48dp"
-            android:text="@string/add_profile_create_a_3_digit_pin"
+            android:text="@string/add_profile_activity_pin_check_box_text"
             android:textColor="@color/component_color_shared_secondary_1_text_color"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/add_profile_activity_user_name" />
@@ -114,7 +114,7 @@
             android:id="@+id/add_profile_activity_info_image_view"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:contentDescription="@string/add_profile_info_content_description"
+            android:contentDescription="@string/add_profile_activity_info_image_content_description"
             android:padding="12dp"
             android:tint="@color/component_color_add_profile_activity_info_icon_color"
             app:layout_constraintEnd_toEndOf="parent"
@@ -137,9 +137,9 @@
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:layout_marginTop="24dp"
-              android:hint="@string/add_profile_input_pin"
+              android:hint="@string/add_profile_activity_input_pin_hint"
               app:errorMessage="@{viewModel.pinErrorMsg}"
-              app:helperText="@string/add_profile_required"
+              app:helperText="@string/add_profile_activity_user_name_helper_text"
               app:helperTextEnabled="true"
               app:layout_constraintEnd_toEndOf="parent"
               app:layout_constraintStart_toStartOf="parent"
@@ -162,9 +162,9 @@
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:layout_marginTop="@dimen/add_profile_confirm_pin_margin_top"
-              android:hint="@string/add_profile_input_confirm_pin"
+              android:hint="@string/add_profile_activity_input_confirm_pin_hint"
               app:errorMessage="@{viewModel.confirmPinErrorMsg}"
-              app:helperText="@string/add_profile_required"
+              app:helperText="@string/add_profile_activity_user_name_helper_text"
               app:helperTextEnabled="true"
               app:layout_constraintEnd_toEndOf="parent"
               app:layout_constraintStart_toStartOf="parent"
@@ -198,7 +198,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif"
-                android:text="@string/add_profile_allow_download_heading"
+                android:text="@string/add_profile_activity_allow_download_text"
                 android:textColor="@color/component_color_shared_primary_text_color"
                 android:textSize="16sp"
                 app:layout_constraintStart_toStartOf="parent"
@@ -210,7 +210,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:fontFamily="sans-serif"
-                android:text="@string/add_profile_allow_download_sub"
+                android:text="@string/add_profile_activity_allow_download_sub_text"
                 android:textColor="@color/component_color_shared_secondary_2_text_color"
                 android:textSize="14sp"
                 app:layout_constraintStart_toStartOf="parent"
@@ -237,7 +237,7 @@
             android:background="@{viewModel.isButtonActive() ? @drawable/state_button_primary_background : @drawable/start_button_transparent_background}"
             android:enabled="@{viewModel.isButtonActive()}"
             android:gravity="center"
-            android:text="@string/add_profile_create_btn"
+            android:text="@string/add_profile_activity_create_button_text"
             android:textColor="@{viewModel.isButtonActive() ? @color/component_color_shared_secondary_4_text_color : @color/component_color_shared_button_inactive_text_color }"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/add_profile_activity_pin_constraint_layout" />
diff --git a/app/src/main/res/layout/admin_auth_activity.xml b/app/src/main/res/layout/admin_auth_activity.xml
index 37b381f214a..7b22ca74753 100644
--- a/app/src/main/res/layout/admin_auth_activity.xml
+++ b/app/src/main/res/layout/admin_auth_activity.xml
@@ -31,9 +31,9 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
-        app:navigationContentDescription="@string/admin_auth_close"
+        app:navigationContentDescription="@string/admin_auth_activity_tool_bar_content_desc"
         app:navigationIcon="@drawable/ic_close_white_24dp"
-        app:title="@string/admin_auth_toolbar"
+        app:title="@string/admin_auth_activity_title"
         app:titleTextAppearance="@style/ToolbarTextAppearance"
         app:titleTextColor="@color/component_color_shared_activity_toolbar_text_color" />
     </com.google.android.material.appbar.AppBarLayout>
@@ -67,7 +67,7 @@
           android:layout_marginTop="40dp"
           android:layout_marginEnd="@dimen/admin_auth_activity_admin_pin_main_text_view_margin_end"
           android:maxLines="2"
-          android:text="@string/admin_auth_heading"
+          android:text="@string/admin_auth_activity_heading_text"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toTopOf="parent" />
@@ -78,7 +78,7 @@
           android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:layout_marginTop="12dp"
-          android:text="@string/admin_auth_sub"
+          android:text="@string/admin_auth_activity_subheading_text"
           android:textColor="@color/component_color_shared_secondary_2_text_color"
           app:layout_constraintEnd_toEndOf="@id/admin_auth_heading_textview"
           app:layout_constraintStart_toStartOf="@id/admin_auth_heading_textview"
@@ -90,7 +90,7 @@
           android:layout_width="@dimen/admin_auth_activity_input_width"
           android:layout_height="wrap_content"
           android:layout_marginTop="48dp"
-          android:hint="@string/admin_auth_pin"
+          android:hint="@string/admin_auth_activity_input_pin_hint_text"
           app:errorMessage="@{viewModel.errorMessage}"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintStart_toStartOf="parent"
@@ -116,7 +116,7 @@
           android:background="@{viewModel.isSubmitButtonActive ? @drawable/state_button_primary_background :@drawable/start_button_transparent_background}"
           android:enabled="@{viewModel.isSubmitButtonActive}"
           android:minHeight="48dp"
-          android:text="@string/admin_auth_submit"
+          android:text="@string/admin_auth_activity_submit_button_text"
           android:textColor="@{viewModel.isSubmitButtonActive() ? @color/component_color_shared_secondary_4_text_color : @color/component_color_shared_button_inactive_text_color }"
           app:layout_constraintEnd_toEndOf="@id/admin_auth_input_pin"
           app:layout_constraintHorizontal_bias="1.0"
diff --git a/app/src/main/res/layout/admin_pin_activity.xml b/app/src/main/res/layout/admin_pin_activity.xml
index f22760b80dd..513dcdd38d6 100644
--- a/app/src/main/res/layout/admin_pin_activity.xml
+++ b/app/src/main/res/layout/admin_pin_activity.xml
@@ -57,7 +57,7 @@
           android:layout_marginStart="@dimen/admin_pin_activity_admin_pin_main_text_view_margin_start"
           android:layout_marginTop="32dp"
           android:layout_marginEnd="@dimen/admin_pin_activity_admin_pin_main_text_view_margin_end"
-          android:text="@string/admin_pin_requirement_description"
+          android:text="@string/admin_pin_activity_requirement_description_text"
           android:textColor="@color/component_color_shared_secondary_1_text_color"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintStart_toStartOf="parent"
@@ -69,7 +69,7 @@
           android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:layout_marginTop="16dp"
-          android:text="@string/admin_pin_pin_description"
+          android:text="@string/admin_pin_activity_warning_text"
           android:textColor="@color/component_color_shared_secondary_1_text_color"
           app:layout_constraintEnd_toEndOf="@id/admin_pin_main_text"
           app:layout_constraintStart_toStartOf="@+id/admin_pin_main_text"
@@ -81,7 +81,7 @@
           android:layout_width="@dimen/admin_pin_activity_input_width"
           android:layout_height="wrap_content"
           android:layout_marginTop="28dp"
-          android:hint="@string/admin_pin_new_pin"
+          android:hint="@string/admin_pin_activity_input_new_pin_hint"
           app:errorMessage="@{viewModel.pinErrorMsg}"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintStart_toStartOf="parent"
@@ -104,7 +104,7 @@
           android:layout_width="@dimen/admin_pin_activity_input_width"
           android:layout_height="wrap_content"
           android:layout_marginTop="16dp"
-          android:hint="@string/admin_pin_new_confirm"
+          android:hint="@string/admin_pin_activity_input_confirm_pin_hint"
           app:errorMessage="@{viewModel.confirmPinErrorMsg}"
           app:layout_constraintEnd_toEndOf="@id/admin_pin_input_pin"
           app:layout_constraintStart_toStartOf="@id/admin_pin_input_pin"
@@ -133,7 +133,7 @@
           android:clickable="@{viewModel.isButtonActive()}"
           android:enabled="@{viewModel.isButtonActive()}"
           android:minHeight="48dp"
-          android:text="@string/save"
+          android:text="@string/admin_pin_activity_submit_button_text"
           android:textColor="@{viewModel.isButtonActive() ? @color/component_color_shared_secondary_4_text_color : @color/component_color_shared_button_inactive_text_color }"
           app:layout_constraintEnd_toEndOf="@id/admin_pin_input_confirm_pin"
           app:layout_constraintTop_toBottomOf="@+id/admin_pin_input_confirm_pin" />
diff --git a/app/src/main/res/layout/admin_settings_dialog.xml b/app/src/main/res/layout/admin_settings_dialog.xml
index 8e3100fef5b..8b732c10562 100755
--- a/app/src/main/res/layout/admin_settings_dialog.xml
+++ b/app/src/main/res/layout/admin_settings_dialog.xml
@@ -22,7 +22,7 @@
       android:layout_marginTop="32dp"
       android:layout_marginEnd="24dp"
       android:layout_marginBottom="20dp"
-      android:hint="@string/admin_settings_label"
+      android:hint="@string/admin_settings_dialog_input_pin_hint"
       app:errorMessage="@{viewModel.errorMessage}">
 
       <com.google.android.material.textfield.TextInputEditText
diff --git a/app/src/main/res/layout/administrator_controls_account_actions_view.xml b/app/src/main/res/layout/administrator_controls_account_actions_view.xml
index 325c227f1ab..d3222762385 100644
--- a/app/src/main/res/layout/administrator_controls_account_actions_view.xml
+++ b/app/src/main/res/layout/administrator_controls_account_actions_view.xml
@@ -22,7 +22,7 @@
       android:paddingTop="28dp"
       android:paddingEnd="@dimen/administrator_control_account_actions_view_account_actions_text_view_padding_end"
       android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_account_actions_label"
+      android:text="@string/administrator_controls_fragment_account_actions_text"
       android:textColor="@color/component_color_shared_active_text_color"
       app:layout_constraintBottom_toTopOf="@id/log_out_text_view"
       app:layout_constraintEnd_toEndOf="parent"
@@ -39,7 +39,7 @@
       android:paddingTop="20dp"
       android:paddingEnd="@dimen/administrator_control_account_actions_view_log_out_text_view_padding_end"
       android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_log_out"
+      android:text="@string/administrator_controls_fragment_log_out_text"
       android:textColor="@color/component_color_shared_primary_dark_text_color"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/administrator_controls_app_information_view.xml b/app/src/main/res/layout/administrator_controls_app_information_view.xml
index 5183ea666d5..89e309ce016 100644
--- a/app/src/main/res/layout/administrator_controls_app_information_view.xml
+++ b/app/src/main/res/layout/administrator_controls_app_information_view.xml
@@ -22,7 +22,7 @@
       android:paddingTop="28dp"
       android:paddingEnd="@dimen/administrator_controls_app_information_view_app_information_text_view_padding_end"
       android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_app_information_label"
+      android:text="@string/administrator_controls_fragment_app_information_text"
       android:textColor="@color/component_color_shared_active_text_color"
       app:layout_constraintBottom_toTopOf="@id/app_version_text_view"
       app:layout_constraintEnd_toEndOf="parent"
@@ -39,7 +39,7 @@
       android:paddingTop="20dp"
       android:paddingEnd="@dimen/administrator_controls_app_information_view_app_version_text_view_padding_end"
       android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_app_version"
+      android:text="@string/administrator_controls_fragment_app_version_text"
       android:textColor="@color/component_color_shared_primary_dark_text_color"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/administrator_controls_download_permissions_view.xml b/app/src/main/res/layout/administrator_controls_download_permissions_view.xml
index 1a521a0cd1c..7ff9cf40ce5 100644
--- a/app/src/main/res/layout/administrator_controls_download_permissions_view.xml
+++ b/app/src/main/res/layout/administrator_controls_download_permissions_view.xml
@@ -22,7 +22,7 @@
       android:paddingTop="28dp"
       android:paddingEnd="@dimen/administrator_controls_download_permissions_view_download_permissions_text_view_padding_end"
       android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_download_permissions_label"
+      android:text="@string/administrator_controls_fragment_download_permissions_label"
       android:textColor="@color/component_color_shared_active_text_color"
       app:layout_constraintBottom_toTopOf="@id/topic_update_on_wifi_constraint_layout"
       app:layout_constraintEnd_toEndOf="parent"
@@ -51,7 +51,7 @@
         android:id="@+id/topic_update_on_wifi_title_text_view"
         style="@style/Body"
         android:paddingBottom="4dp"
-        android:text="@string/administrator_controls_update_on_wifi_title"
+        android:text="@string/administrator_controls_fragment_topic_update_on_wifi_text"
         android:textColor="@color/component_color_shared_primary_dark_text_color"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -60,7 +60,7 @@
         android:id="@+id/topic_update_on_wifi_description_text_view"
         style="@style/Subtitle2ViewStart"
         android:layout_width="0dp"
-        android:text="@string/administrator_controls_update_on_wifi_message"
+        android:text="@string/administrator_controls_fragment_topic_update_on_wifi_description"
         android:textColor="@color/component_color_shared_secondary_3_text_color"
         app:layout_constraintEnd_toStartOf="@id/topic_update_on_wifi_switch"
         app:layout_constraintStart_toStartOf="parent"
@@ -116,7 +116,7 @@
         android:id="@+id/auto_update_topic_title_text_view"
         style="@style/Body"
         android:paddingBottom="4dp"
-        android:text="@string/administrator_controls_auto_update_title"
+        android:text="@string/administrator_controls_fragment_auto_update_topic_text"
         android:textColor="@color/component_color_shared_primary_dark_text_color"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -125,7 +125,7 @@
         android:id="@+id/auto_update_topic_description_text_view"
         style="@style/Subtitle2ViewStart"
         android:layout_width="0dp"
-        android:text="@string/administrator_controls_auto_update_message"
+        android:text="@string/administrator_controls_fragment_auto_update_topic_description"
         android:textColor="@color/component_color_shared_secondary_3_text_color"
         app:layout_constraintEnd_toStartOf="@id/auto_update_topic_switch"
         app:layout_constraintHorizontal_weight="1"
diff --git a/app/src/main/res/layout/administrator_controls_general_view.xml b/app/src/main/res/layout/administrator_controls_general_view.xml
index 9b815b48f14..7c84c3b126c 100644
--- a/app/src/main/res/layout/administrator_controls_general_view.xml
+++ b/app/src/main/res/layout/administrator_controls_general_view.xml
@@ -22,7 +22,7 @@
       android:paddingTop="@dimen/administrator_controls_general_view_general_text_view_padding_top"
       android:paddingEnd="@dimen/administrator_controls_general_view_general_text_view_padding_end"
       android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_general_label"
+      android:text="@string/administrator_controls_fragment_general_label"
       android:textColor="@color/component_color_shared_active_text_color"
       app:layout_constraintBottom_toTopOf="@id/edit_account_text_view"
       app:layout_constraintEnd_toEndOf="parent"
@@ -38,7 +38,7 @@
       android:paddingTop="20dp"
       android:paddingEnd="@dimen/administrator_controls_general_view_edit_account_text_view_padding_end"
       android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_edit_account"
+      android:text="@string/administrator_controls_fragment_edit_account_text"
       android:textColor="@color/component_color_shared_primary_dark_text_color"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/administrator_controls_learner_analytics_view.xml b/app/src/main/res/layout/administrator_controls_learner_analytics_view.xml
index 2a761c6b17a..4c00c5c394f 100644
--- a/app/src/main/res/layout/administrator_controls_learner_analytics_view.xml
+++ b/app/src/main/res/layout/administrator_controls_learner_analytics_view.xml
@@ -22,7 +22,7 @@
       android:paddingTop="28dp"
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
-      android:text="@string/learner_analytics_label_text"
+      android:text="@string/administrator_controls_activity_learner_analytics_text"
       android:textColor="@color/component_color_shared_active_text_color"
       app:layout_constraintBottom_toTopOf="@id/profile_and_device_id_text_view"
       app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/administrator_controls_profile_view.xml b/app/src/main/res/layout/administrator_controls_profile_view.xml
index b214eaa6d90..1650c3bf340 100644
--- a/app/src/main/res/layout/administrator_controls_profile_view.xml
+++ b/app/src/main/res/layout/administrator_controls_profile_view.xml
@@ -22,7 +22,7 @@
       android:paddingTop="28dp"
       android:paddingEnd="@dimen/administrator_controls_profile_view_profile_management_text_view_padding_end"
       android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_profile_management_label"
+      android:text="@string/administrator_controls_fragment_profile_management_label"
       android:textColor="@color/component_color_shared_active_text_color"
       app:layout_constraintBottom_toTopOf="@id/edit_profiles_text_view"
       app:layout_constraintEnd_toEndOf="parent"
@@ -39,7 +39,7 @@
       android:paddingTop="20dp"
       android:paddingEnd="@dimen/administrator_controls_profile_view_edit_profiles_text_view_padding_end"
       android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_edit_profiles"
+      android:text="@string/administrator_controls_fragment_edit_profiles_text"
       android:textColor="@color/component_color_shared_primary_dark_text_color"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/all_topics.xml b/app/src/main/res/layout/all_topics.xml
index 6d6d101d3dd..38ab9601e7d 100644
--- a/app/src/main/res/layout/all_topics.xml
+++ b/app/src/main/res/layout/all_topics.xml
@@ -22,7 +22,7 @@
       android:layout_marginEnd="@dimen/all_topics_text_margin_end"
       android:layout_marginBottom="@dimen/all_topics_text_margin_bottom"
       android:fontFamily="sans-serif-medium"
-      android:text="@string/select_a_topic_to_start"
+      android:text="@string/home_activity_all_topics_text"
       android:textColor="@color/component_color_shared_primary_text_color"
       android:textSize="18sp" />
   </FrameLayout>
diff --git a/app/src/main/res/layout/app_language_activity.xml b/app/src/main/res/layout/app_language_activity.xml
index cc731dac72d..9ea35764481 100644
--- a/app/src/main/res/layout/app_language_activity.xml
+++ b/app/src/main/res/layout/app_language_activity.xml
@@ -22,7 +22,7 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator"
         app:title="@string/app_language_activity_title"
         app:titleTextAppearance="@style/ToolbarTextAppearance" />
diff --git a/app/src/main/res/layout/app_version_activity.xml b/app/src/main/res/layout/app_version_activity.xml
index 7a81c2647a2..f7f85e8e535 100644
--- a/app/src/main/res/layout/app_version_activity.xml
+++ b/app/src/main/res/layout/app_version_activity.xml
@@ -22,10 +22,10 @@
       android:background="@color/component_color_shared_activity_toolbar_color"
       android:minHeight="?attr/actionBarSize"
       android:textSize="20sp"
-      app:navigationContentDescription="@string/navigate_up"
+      app:navigationContentDescription="@string/navigate_up_text"
       app:navigationIcon="?attr/homeAsUpIndicator"
       app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-      app:title="@string/administrator_controls_app_version"
+      app:title="@string/administrator_controls_fragment_app_version_text"
       app:titleTextAppearance="@style/ToolbarTextAppearance" />
   </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/app_version_fragment.xml b/app/src/main/res/layout/app_version_fragment.xml
index 32ddf6d236f..5ef839682a2 100644
--- a/app/src/main/res/layout/app_version_fragment.xml
+++ b/app/src/main/res/layout/app_version_fragment.xml
@@ -41,7 +41,7 @@
       app:layout_constraintTop_toTopOf="@id/app_last_update_date_text_view"
       app:srcCompat="@drawable/ic_info_icon_gray_24dp"
       app:tint="@color/component_color_app_version_activity_info_icon_color"
-      android:contentDescription="@string/app_info_icon_content_description" />
+      android:contentDescription="@string/app_version_fragment_app_info_icon_description" />
 
     <TextView
       android:id="@+id/app_last_update_date_text_view"
diff --git a/app/src/main/res/layout/audio_fragment.xml b/app/src/main/res/layout/audio_fragment.xml
index 20ca0081c0e..3ff6503acee 100755
--- a/app/src/main/res/layout/audio_fragment.xml
+++ b/app/src/main/res/layout/audio_fragment.xml
@@ -56,7 +56,7 @@
         android:layout_height="52dp"
         android:layout_marginStart="8dp"
         android:clickable="@{viewModel.playStatusLiveData != UiAudioPlayStatus.LOADING}"
-        android:contentDescription="@{viewModel.playStatusLiveData == UiAudioPlayStatus.PLAYING ? @string/audio_pause_description : @string/audio_play_description}"
+        android:contentDescription="@{viewModel.playStatusLiveData == UiAudioPlayStatus.PLAYING ? @string/audio_fragment_pause_description : @string/audio_fragment_play_description}"
         android:onClick="@{(v) -> viewModel.togglePlayPause(viewModel.playStatusLiveData)}"
         android:visibility="@{viewModel.playStatusLiveData != UiAudioPlayStatus.LOADING ? View.VISIBLE : View.INVISIBLE}"
         android:padding="12dp"
@@ -72,7 +72,7 @@
         android:layout_width="0dp"
         android:layout_height="26dp"
         android:layout_marginStart="4dp"
-        android:contentDescription="@string/audio_player_seekbar_content_description"
+        android:contentDescription="@string/audio_fragment_progress_seek_bar_content_description"
         android:max="@{viewModel.durationLiveData}"
         android:maxHeight="4dp"
         android:minWidth="180dp"
@@ -91,7 +91,7 @@
         android:id="@+id/audio_language_icon"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:contentDescription="@string/audio_language_icon_content_description"
+        android:contentDescription="@string/audio_fragment_language_icon_content_description"
         android:gravity="center"
         android:onClick="@{(v) -> audioFragment.languageSelectionClicked()}"
         android:padding="12dp"
diff --git a/app/src/main/res/layout/audio_language_activity.xml b/app/src/main/res/layout/audio_language_activity.xml
index c20c6008011..e7de6f8f30c 100644
--- a/app/src/main/res/layout/audio_language_activity.xml
+++ b/app/src/main/res/layout/audio_language_activity.xml
@@ -22,7 +22,7 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator"
         app:title="@string/audio_language_activity_title"
         app:titleTextAppearance="@style/ToolbarTextAppearance" />
diff --git a/app/src/main/res/layout/beta_notice_dialog_content.xml b/app/src/main/res/layout/beta_notice_dialog_content.xml
index 8a5a5a39b6f..354ca63962f 100755
--- a/app/src/main/res/layout/beta_notice_dialog_content.xml
+++ b/app/src/main/res/layout/beta_notice_dialog_content.xml
@@ -13,7 +13,7 @@
     android:layout_height="wrap_content"
     android:autoLink="email"
     android:fontFamily="sans-serif"
-    android:text="@string/beta_notice_dialog_message"
+    android:text="@string/beta_notice_dialog_message_text"
     android:textColor="@color/component_color_shared_primary_text_color"
     android:textColorLink="@color/component_color_shared_link_text_color"
     android:textSize="16sp"
@@ -28,7 +28,7 @@
     android:buttonTint="@color/component_color_shared_checkbox_selector"
     android:fontFamily="sans-serif"
     android:minHeight="48dp"
-    android:text="@string/beta_notice_dialog_do_not_show_again_text"
+    android:text="@string/beta_notice_dialog_preference_checkbox_text"
     android:textColor="@color/component_color_shared_primary_text_color"
     android:textSize="16sp"
     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/bottom_left_overlay.xml b/app/src/main/res/layout/bottom_left_overlay.xml
index d716c007616..4228b3677a3 100644
--- a/app/src/main/res/layout/bottom_left_overlay.xml
+++ b/app/src/main/res/layout/bottom_left_overlay.xml
@@ -26,7 +26,7 @@
       app:layout_constraintTop_toTopOf="parent"
       app:srcCompat="@drawable/ic_rounded_arrow_up_right"
       app:tint="@color/component_color_shared_spotlight_overlay_arrow_color"
-      android:contentDescription="@string/spotlight_overlay_arrow_content_description" />
+      android:contentDescription="@string/spotlight_fragment_overlay_arrow_content_description" />
 
     <com.google.android.material.card.MaterialCardView
       android:layout_width="0dp"
@@ -72,7 +72,7 @@
           app:layout_constraintTop_toTopOf="parent"
           app:srcCompat="@drawable/ic_close_black_24"
           app:tint="@color/component_color_shared_close_spotlight_button_color"
-          android:contentDescription="@string/close_spotlight_button_content_description" />
+          android:contentDescription="@string/spotlight_fragment_close_button_content_description" />
       </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
   </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/bottom_right_overlay.xml b/app/src/main/res/layout/bottom_right_overlay.xml
index 9e300abdf98..7e7048c1371 100644
--- a/app/src/main/res/layout/bottom_right_overlay.xml
+++ b/app/src/main/res/layout/bottom_right_overlay.xml
@@ -27,7 +27,7 @@
       app:layout_constraintTop_toTopOf="parent"
       app:srcCompat="@drawable/ic_rounded_arrow_up_right"
       app:tint="@color/component_color_shared_spotlight_overlay_arrow_color"
-      android:contentDescription="@string/spotlight_overlay_arrow_content_description" />
+      android:contentDescription="@string/spotlight_fragment_overlay_arrow_content_description" />
 
     <com.google.android.material.card.MaterialCardView
       android:layout_width="0dp"
@@ -73,7 +73,7 @@
           app:layout_constraintTop_toTopOf="parent"
           app:srcCompat="@drawable/ic_close_black_24"
           app:tint="@color/component_color_shared_close_spotlight_button_color"
-          android:contentDescription="@string/close_spotlight_button_content_description" />
+          android:contentDescription="@string/spotlight_fragment_close_button_content_description" />
       </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
   </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/bottom_sheet_options_menu_fragment.xml b/app/src/main/res/layout/bottom_sheet_options_menu_fragment.xml
index fe98ab51455..029f7f478b2 100644
--- a/app/src/main/res/layout/bottom_sheet_options_menu_fragment.xml
+++ b/app/src/main/res/layout/bottom_sheet_options_menu_fragment.xml
@@ -18,7 +18,7 @@
       android:drawableTint="@color/component_color_shared_multipane_icon_color"
       android:gravity="center_vertical"
       android:minHeight="48dp"
-      android:text="@string/menu_options"
+      android:text="@string/menu_options_text"
       android:textColor="@color/component_color_shared_primary_dark_text_color"
       android:textSize="20sp"
       app:drawableStartCompat="@drawable/ic_options_icon_grey_24dp" />
@@ -31,7 +31,7 @@
       android:drawableTint="@color/component_color_shared_multipane_icon_color"
       android:gravity="center_vertical"
       android:minHeight="48dp"
-      android:text="@string/menu_help"
+      android:text="@string/menu_help_text"
       android:textColor="@color/component_color_shared_primary_dark_text_color"
       android:textSize="20sp"
       app:drawableStartCompat="@drawable/ic_baseline_help_outline_24" />
@@ -44,7 +44,7 @@
       android:drawableTint="@color/component_color_shared_multipane_icon_color"
       android:gravity="center_vertical"
       android:minHeight="48dp"
-      android:text="@string/bottom_sheet_options_menu_close"
+      android:text="@string/exploration_activity_options_menu_close_text"
       android:textColor="@color/component_color_shared_primary_dark_text_color"
       android:textSize="20sp"
       app:drawableStartCompat="@drawable/ic_baseline_close_24" />
diff --git a/app/src/main/res/layout/cellular_data_dialog.xml b/app/src/main/res/layout/cellular_data_dialog.xml
index 5715d0370e0..b93a28c80f6 100755
--- a/app/src/main/res/layout/cellular_data_dialog.xml
+++ b/app/src/main/res/layout/cellular_data_dialog.xml
@@ -15,7 +15,7 @@
     android:paddingTop="@dimen/cellular_data_dialog_padding"
     android:paddingEnd="16dp"
     android:paddingBottom="@dimen/cellular_data_dialog_padding"
-    android:text="@string/cellular_data_alert_dialog_checkbox"
+    android:text="@string/cellular_audio_dialog_checkboxes_text"
     android:textColor="@color/component_color_shared_primary_dark_text_color"
     android:textSize="16sp" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/completed_story_list_fragment.xml b/app/src/main/res/layout/completed_story_list_fragment.xml
index c1d2f5c0a9b..c964abe9beb 100644
--- a/app/src/main/res/layout/completed_story_list_fragment.xml
+++ b/app/src/main/res/layout/completed_story_list_fragment.xml
@@ -30,7 +30,7 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator"
         app:title="@string/completed_story_list_activity_title"
         app:titleTextAppearance="@style/ToolbarTextAppearance"
@@ -56,7 +56,7 @@
         android:paddingEnd="@dimen/completed_story_list_fragment_recyclerview_padding_end"
         android:paddingBottom="@dimen/completed_story_list_fragment_recyclerview_padding_bottom"
         android:scrollbars="none"
-        android:tag="@string/completed_story_list_recyclerview_tag"
+        android:tag="@string/completed_story_list_fragment_recyclerview_tag"
         app:data="@{viewModel.completedStoryListLiveData}" />
 
       <View
diff --git a/app/src/main/res/layout/concept_card_fragment.xml b/app/src/main/res/layout/concept_card_fragment.xml
index 4dda98feef3..4f139d505e6 100644
--- a/app/src/main/res/layout/concept_card_fragment.xml
+++ b/app/src/main/res/layout/concept_card_fragment.xml
@@ -23,7 +23,7 @@
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
-      app:title="@string/concept_card_toolbar_title"
+      app:title="@string/concept_card_fragment_title"
       app:titleTextAppearance="@style/ToolbarTextAppearance"
       app:titleTextColor="@color/component_color_shared_activity_toolbar_text_color" />
 
diff --git a/app/src/main/res/layout/concept_card_fragment_test_activity.xml b/app/src/main/res/layout/concept_card_fragment_test_activity.xml
index 9f8586d5570..0f016c79b0d 100644
--- a/app/src/main/res/layout/concept_card_fragment_test_activity.xml
+++ b/app/src/main/res/layout/concept_card_fragment_test_activity.xml
@@ -7,13 +7,13 @@
     android:id="@+id/open_dialog_0"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="@string/concept_card_one_button_text"
+    android:text="@string/concept_card_test_activity_button_one_text"
     android:textAllCaps="false"/>
 
   <Button
     android:id="@+id/open_dialog_1"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="@string/concept_card_two_button_text"
+    android:text="@string/concept_card_test_activity_button_two_text"
     android:textAllCaps="false" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/continue_interaction_item.xml b/app/src/main/res/layout/continue_interaction_item.xml
index 5ebab739f3d..318b1c98eb4 100644
--- a/app/src/main/res/layout/continue_interaction_item.xml
+++ b/app/src/main/res/layout/continue_interaction_item.xml
@@ -47,7 +47,7 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
       app:tint="@color/component_color_shared_back_forward_arrow_button_color"
-      android:contentDescription="@string/previous_state_navigation_button_content_description" />
+      android:contentDescription="@string/state_fragment_previous_navigation_button_description" />
 
     <org.oppia.android.app.customview.ContinueButtonView
       android:id="@+id/continue_interaction_button"
@@ -55,7 +55,7 @@
       android:layout_width="wrap_content"
       android:gravity="center_vertical"
       android:onClick="@{(v) -> viewModel.handleButtonClicked()}"
-      android:text="@string/state_continue_button"
+      android:text="@string/state_fragment_continue_button_text"
       app:continueButtonAnimationTimestampMs="@{viewModel.continueButtonAnimationTimestampMs}"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/continue_navigation_button_item.xml b/app/src/main/res/layout/continue_navigation_button_item.xml
index c8f5f736e5f..602f9a1fa85 100644
--- a/app/src/main/res/layout/continue_navigation_button_item.xml
+++ b/app/src/main/res/layout/continue_navigation_button_item.xml
@@ -46,7 +46,7 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
       app:tint="@color/component_color_shared_back_forward_arrow_button_color"
-      android:contentDescription="@string/previous_state_navigation_button_content_description" />
+      android:contentDescription="@string/state_fragment_previous_navigation_button_description" />
 
     <org.oppia.android.app.customview.ContinueButtonView
       android:id="@+id/continue_navigation_button"
@@ -54,7 +54,7 @@
       android:layout_width="wrap_content"
       android:gravity="center_vertical"
       android:onClick="@{(v) -> buttonViewModel.continueNavigationButtonListener.onContinueButtonClicked()}"
-      android:text="@string/state_continue_button"
+      android:text="@string/state_fragment_continue_button_text"
       app:continueButtonAnimationTimestampMs="@{buttonViewModel.continueButtonAnimationTimestampMs}"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/drag_drop_interaction_item.xml b/app/src/main/res/layout/drag_drop_interaction_item.xml
index 53a7074bcac..bdf244d8603 100644
--- a/app/src/main/res/layout/drag_drop_interaction_item.xml
+++ b/app/src/main/res/layout/drag_drop_interaction_item.xml
@@ -50,7 +50,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:paddingBottom="8dp"
-      android:text="@string/drag_and_drop_interaction_group_merge_hint"
+      android:text="@string/state_fragment_drag_drop_interaction_group_merge_hint"
       android:textSize="14sp"
       android:textStyle="italic"
       android:visibility="@{viewModel.getGroupingStatus()? View.VISIBLE : View.GONE}" />
diff --git a/app/src/main/res/layout/drawer_fragment.xml b/app/src/main/res/layout/drawer_fragment.xml
index 31558550a83..10a3d346aa4 100644
--- a/app/src/main/res/layout/drawer_fragment.xml
+++ b/app/src/main/res/layout/drawer_fragment.xml
@@ -68,7 +68,7 @@
             android:layout_gravity="center_vertical"
             app:srcCompat="@drawable/ic_baseline_code_24"
             android:tint="@{footerViewModel.isDeveloperOptionsSelected ? @color/component_color_drawer_fragment_developer_options_selected_image_color : @color/component_color_shared_primary_dark_text_color}"
-            android:contentDescription="@string/developer_options_icon_content_description" />
+            android:contentDescription="@string/navigation_drawer_fragment_developer_options_icon_description" />
 
           <TextView
             android:layout_width="match_parent"
@@ -76,7 +76,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginStart="12dp"
             android:fontFamily="sans-serif-medium"
-            android:text="@string/developer_options"
+            android:text="@string/navigation_drawer_fragment_developer_options"
             android:textColor="@{footerViewModel.isDeveloperOptionsSelected ? @color/component_color_drawer_fragment_developer_options_selected_text_color : @color/component_color_shared_primary_dark_text_color}"
             android:textSize="14sp" />
         </LinearLayout>
@@ -100,7 +100,7 @@
             android:layout_gravity="center_vertical"
             android:tint="@{footerViewModel.isAdministratorControlsSelected ? @color/component_color_drawer_fragment_admin_controls_selected_image_color : @color/component_color_shared_primary_dark_text_color}"
             app:srcCompat="@drawable/ic_admin_settings_icon_brown_24dp"
-            android:contentDescription="@string/administrator_controls_icon_content_description" />
+            android:contentDescription="@string/navigation_drawer_fragment_administrator_controls_icon_description" />
 
           <TextView
             android:layout_width="match_parent"
@@ -108,7 +108,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginStart="12dp"
             android:fontFamily="sans-serif-medium"
-            android:text="@string/administrator_controls"
+            android:text="@@string/administrator_controls_activity_title"
             android:textColor="@{footerViewModel.isAdministratorControlsSelected ? @color/component_color_drawer_fragment_admin_controls_selected_text_color : @color/component_color_shared_primary_dark_text_color}"
             android:textSize="14sp" />
         </LinearLayout>
diff --git a/app/src/main/res/layout/exploration_activity.xml b/app/src/main/res/layout/exploration_activity.xml
index 39d0e3356dc..4c14d79d0b7 100755
--- a/app/src/main/res/layout/exploration_activity.xml
+++ b/app/src/main/res/layout/exploration_activity.xml
@@ -51,7 +51,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_gravity="end"
-            android:contentDescription="@{viewModel.isAudioStreamingOn ? @string/audio_player_on : @string/audio_player_off}"
+            android:contentDescription="@{viewModel.isAudioStreamingOn ? @string/exploration_activity_audio_player_on_text : @string/exploration_activity_audio_player_off_text}"
             android:scaleType="center"
             android:visibility="@{viewModel.showAudioButton ? View.VISIBLE : View.GONE}"
             app:srcCompat="@{viewModel.isAudioStreamingOn ? @drawable/ic_baseline_headset_24 : @drawable/ic_baseline_headset_off_24}" />
diff --git a/app/src/main/res/layout/exploration_test_activity.xml b/app/src/main/res/layout/exploration_test_activity.xml
index 19a0bc3a9c5..8aef0e682c9 100644
--- a/app/src/main/res/layout/exploration_test_activity.xml
+++ b/app/src/main/res/layout/exploration_test_activity.xml
@@ -10,7 +10,7 @@
     android:id="@+id/play_exploration_button"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="@string/play_exploration_button_text"
+    android:text="@string/exploration_activity_play_button_text"
     android:textAllCaps="false"/>
 
   <FrameLayout
diff --git a/app/src/main/res/layout/faq_item_header.xml b/app/src/main/res/layout/faq_item_header.xml
index 8853d55ab5c..a22a867eb00 100644
--- a/app/src/main/res/layout/faq_item_header.xml
+++ b/app/src/main/res/layout/faq_item_header.xml
@@ -18,7 +18,7 @@
     android:layout_marginEnd="@dimen/faq_item_header_margin_end"
     android:layout_marginBottom="@dimen/faq_item_header_margin_bottom"
     android:fontFamily="sans-serif-medium"
-    android:text="@string/featured_questions"
+    android:text="@string/faq_list_activity_item_header_text"
     android:textColor="@color/component_color_shared_primary_text_color"
     android:textSize="18sp" />
 </layout>
diff --git a/app/src/main/res/layout/faq_single_activity.xml b/app/src/main/res/layout/faq_single_activity.xml
index 57ff8b42939..e2ca1e5d67c 100644
--- a/app/src/main/res/layout/faq_single_activity.xml
+++ b/app/src/main/res/layout/faq_single_activity.xml
@@ -23,7 +23,7 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator"
         app:titleTextAppearance="@style/ToolbarTextAppearance" />
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/force_network_type_fragment.xml b/app/src/main/res/layout/force_network_type_fragment.xml
index 52f3c74d35b..024b4bdfd02 100644
--- a/app/src/main/res/layout/force_network_type_fragment.xml
+++ b/app/src/main/res/layout/force_network_type_fragment.xml
@@ -31,7 +31,7 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         app:title="@string/developer_options_force_network_type"
diff --git a/app/src/main/res/layout/hint_summary.xml b/app/src/main/res/layout/hint_summary.xml
index f25a4fa3774..750ba2f0bfd 100644
--- a/app/src/main/res/layout/hint_summary.xml
+++ b/app/src/main/res/layout/hint_summary.xml
@@ -77,7 +77,7 @@
             android:paddingTop="8dp"
             android:paddingEnd="16dp"
             android:paddingBottom="8dp"
-            android:text="@string/reveal_hint"
+            android:text="@string/hint_solution_dialog_reveal_hint_text"
             android:textColor="@color/component_color_hints_and_solution_summary_button_text_color"
             android:textSize="14sp"
             android:textAllCaps="false"
@@ -98,7 +98,7 @@
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"
             android:background="@color/component_color_shared_transparent_background_color"
-            android:contentDescription="@{isListExpanded? @string/hide_hint : @string/reveal_hint}"
+            android:contentDescription="@{isListExpanded? @string/hint_solution_dialog_hide_hint_description : @string/hint_solution_dialog_reveal_hint_text}"
             android:minWidth="48dp"
             android:minHeight="48dp"
             android:padding="8dp"
diff --git a/app/src/main/res/layout/hints_and_solution_fragment.xml b/app/src/main/res/layout/hints_and_solution_fragment.xml
index e1d9dba6d20..80bcff2317a 100644
--- a/app/src/main/res/layout/hints_and_solution_fragment.xml
+++ b/app/src/main/res/layout/hints_and_solution_fragment.xml
@@ -30,7 +30,7 @@
         android:background="@color/component_color_hints_and_solutions_fragment_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
-        app:title="@string/hints_toolbar_title"
+        app:title="@string/state_fragment_hint_bar_title"
         app:titleTextAppearance="@style/ToolbarTextAppearance"
         app:titleTextColor="@color/component_color_shared_activity_toolbar_text_color" />
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/license_text_viewer_activity.xml b/app/src/main/res/layout/license_text_viewer_activity.xml
index 27ae57ad76a..8cb0184e35a 100644
--- a/app/src/main/res/layout/license_text_viewer_activity.xml
+++ b/app/src/main/res/layout/license_text_viewer_activity.xml
@@ -21,7 +21,7 @@
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
         android:theme="@style/Widget.AppCompat.ActionBar"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator">
 
         <TextView
diff --git a/app/src/main/res/layout/mark_chapters_completed_fragment.xml b/app/src/main/res/layout/mark_chapters_completed_fragment.xml
index 3356afab4e5..97fa4d90514 100644
--- a/app/src/main/res/layout/mark_chapters_completed_fragment.xml
+++ b/app/src/main/res/layout/mark_chapters_completed_fragment.xml
@@ -35,7 +35,7 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         app:title="@string/developer_options_mark_chapters_completed"
diff --git a/app/src/main/res/layout/mark_stories_completed_fragment.xml b/app/src/main/res/layout/mark_stories_completed_fragment.xml
index 0e91ed01237..3ea32dc0071 100644
--- a/app/src/main/res/layout/mark_stories_completed_fragment.xml
+++ b/app/src/main/res/layout/mark_stories_completed_fragment.xml
@@ -35,7 +35,7 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         app:title="@string/developer_options_mark_stories_completed"
diff --git a/app/src/main/res/layout/mark_topics_completed_fragment.xml b/app/src/main/res/layout/mark_topics_completed_fragment.xml
index 332830cad14..1beaab40d5c 100644
--- a/app/src/main/res/layout/mark_topics_completed_fragment.xml
+++ b/app/src/main/res/layout/mark_topics_completed_fragment.xml
@@ -35,7 +35,7 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         app:title="@string/developer_options_mark_topics_completed"
diff --git a/app/src/main/res/layout/math_expression_parser_fragment.xml b/app/src/main/res/layout/math_expression_parser_fragment.xml
index ce6208c4ddf..0a5b185746e 100644
--- a/app/src/main/res/layout/math_expression_parser_fragment.xml
+++ b/app/src/main/res/layout/math_expression_parser_fragment.xml
@@ -35,7 +35,7 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         app:title="@string/developer_options_math_expressions"
diff --git a/app/src/main/res/layout/next_button_item.xml b/app/src/main/res/layout/next_button_item.xml
index 4bf8c53f2fe..4058782c6b8 100644
--- a/app/src/main/res/layout/next_button_item.xml
+++ b/app/src/main/res/layout/next_button_item.xml
@@ -46,7 +46,7 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
       app:tint="@color/component_color_shared_back_forward_arrow_button_color"
-      android:contentDescription="@string/previous_button_content_description" />
+      android:contentDescription="@string/state_fragment_previous_button_description" />
 
     <ImageButton
       android:id="@+id/next_state_navigation_button"
@@ -57,6 +57,6 @@
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintTop_toTopOf="parent"
       app:tint="@color/component_color_shared_back_forward_arrow_button_color"
-      android:contentDescription="@string/next_button_content_description" />
+      android:contentDescription="@string/state_fragment_next_button_description" />
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/numeric_input_interaction_item.xml b/app/src/main/res/layout/numeric_input_interaction_item.xml
index 2666f370985..27326e6b504 100644
--- a/app/src/main/res/layout/numeric_input_interaction_item.xml
+++ b/app/src/main/res/layout/numeric_input_interaction_item.xml
@@ -24,7 +24,7 @@
       android:id="@+id/numeric_input_interaction_view"
       style="@style/InputInteractionEditText"
       android:digits="0123456789.-"
-      android:hint="@string/numeric_input_hint"
+      android:hint="@string/state_fragment_numeric_input_interaction_hint"
       android:inputType="numberDecimal"
       android:text="@={viewModel.answerText}"
       android:textColorHint="@color/component_color_shared_edit_text_hint_color"
diff --git a/app/src/main/res/layout/onboarding_fragment.xml b/app/src/main/res/layout/onboarding_fragment.xml
index d8e747840c3..ab5b9dbd2c9 100644
--- a/app/src/main/res/layout/onboarding_fragment.xml
+++ b/app/src/main/res/layout/onboarding_fragment.xml
@@ -67,7 +67,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="20dp"
-        android:contentDescription="@string/next_arrow"
+        android:contentDescription="@string/onboarding_activity_next_arrow_text"
         android:gravity="center"
         android:minWidth="48dp"
         android:minHeight="48dp"
@@ -87,7 +87,7 @@
         android:minWidth="48dp"
         android:minHeight="48dp"
         android:onClick="@{(v) -> presenter.clickOnSkip()}"
-        android:text="@string/skip"
+        android:text="@string/onboarding_activity_skip_text"
         android:textAllCaps="true"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:visibility="@{viewModel.slideNumber != (viewModel.totalNumberOfSlides - 1) ? View.VISIBLE: View.GONE, default=visible}"
diff --git a/app/src/main/res/layout/onboarding_slide_final.xml b/app/src/main/res/layout/onboarding_slide_final.xml
index ee4bc712c2b..84bc48fa59e 100644
--- a/app/src/main/res/layout/onboarding_slide_final.xml
+++ b/app/src/main/res/layout/onboarding_slide_final.xml
@@ -45,7 +45,7 @@
         android:layout_marginBottom="16dp"
         android:fontFamily="sans-serif-medium"
         android:gravity="center_horizontal"
-        android:text="@string/onboarding_slide_3_title"
+        android:text="@string/onboarding_activity_slide_3_title"
         android:textColor="@color/component_color_shared_primary_text_color"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -60,7 +60,7 @@
         android:layout_marginEnd="48dp"
         android:maxLines="2"
         android:minLines="2"
-        android:text="@string/onboarding_slide_3_description"
+        android:text="@string/onboarding_activity_slide_3_description"
         android:textColor="@color/component_color_shared_secondary_1_text_color"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -78,7 +78,7 @@
         android:fontFamily="sans-serif-medium"
         android:minHeight="48dp"
         android:onClick="@{(v) -> viewModel.clickOnGetStarted()}"
-        android:text="@string/get_started"
+        android:text="@string/onboarding_activity_get_started_text"
         android:textColor="@color/component_color_shared_secondary_4_text_color"
         android:textSize="14sp"
         android:textAllCaps="false"
diff --git a/app/src/main/res/layout/ongoing_topic_list_fragment.xml b/app/src/main/res/layout/ongoing_topic_list_fragment.xml
index d30aaf063cc..d37dc6b9fcb 100644
--- a/app/src/main/res/layout/ongoing_topic_list_fragment.xml
+++ b/app/src/main/res/layout/ongoing_topic_list_fragment.xml
@@ -30,9 +30,9 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator"
-        app:title="@string/topics_in_progress"
+        app:title="@string/ongoing_topic_list_activity_title"
         app:titleTextAppearance="@style/ToolbarTextAppearance"
         app:titleTextColor="@color/component_color_shared_activity_toolbar_text_color" />
     </com.google.android.material.appbar.AppBarLayout>
@@ -56,7 +56,7 @@
         android:paddingEnd="@dimen/ongoing_topic_list_fragment_padding_end"
         android:paddingBottom="@dimen/ongoing_topic_list_fragment_padding_bottom"
         android:scrollbars="none"
-        android:tag="@string/ongoing_recycler_view_tag"
+        android:tag="@string/ongoing_topic_list_fragment_recycler_view_tag"
         app:data="@{viewModel.ongoingTopicListViewModelLiveData}" />
 
       <View
diff --git a/app/src/main/res/layout/option_app_language.xml b/app/src/main/res/layout/option_app_language.xml
index 8cae1a46579..6ce357375e0 100644
--- a/app/src/main/res/layout/option_app_language.xml
+++ b/app/src/main/res/layout/option_app_language.xml
@@ -27,7 +27,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:fontFamily="sans-serif"
-      android:text="@string/app_language"
+      android:text="@string/option_activity_app_language_text"
       android:textColor="@color/component_color_shared_primary_dark_text_color"
       android:textSize="16sp"
       app:layout_constraintBottom_toTopOf="@id/app_language_text_view"
diff --git a/app/src/main/res/layout/option_audio_language.xml b/app/src/main/res/layout/option_audio_language.xml
index 2ad252b8c12..7bfbcd2816f 100644
--- a/app/src/main/res/layout/option_audio_language.xml
+++ b/app/src/main/res/layout/option_audio_language.xml
@@ -30,7 +30,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:fontFamily="sans-serif"
-      android:text="@string/audio_language"
+      android:text="@string/option_activity_audio_language_text"
       android:textColor="@color/component_color_shared_primary_dark_text_color"
       android:textSize="16sp"
       app:layout_constraintBottom_toTopOf="@id/audio_language_text_view"
diff --git a/app/src/main/res/layout/option_story_text_size.xml b/app/src/main/res/layout/option_story_text_size.xml
index 05ce7a06d16..c92382c918e 100644
--- a/app/src/main/res/layout/option_story_text_size.xml
+++ b/app/src/main/res/layout/option_story_text_size.xml
@@ -27,7 +27,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:fontFamily="sans-serif"
-      android:text="@string/reading_text_size"
+      android:text="@string/option_activity_reading_text_size"
       android:textColor="@color/component_color_shared_primary_dark_text_color"
       android:textSize="16sp"
       app:layout_constraintBottom_toTopOf="@id/reading_text_size_text_view"
diff --git a/app/src/main/res/layout/pin_password_activity.xml b/app/src/main/res/layout/pin_password_activity.xml
index 643c33b4adb..1a6bf79de2a 100644
--- a/app/src/main/res/layout/pin_password_activity.xml
+++ b/app/src/main/res/layout/pin_password_activity.xml
@@ -35,9 +35,9 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
-        app:navigationContentDescription="@string/pin_password_close"
+        app:navigationContentDescription="@string/pin_password_activity_close_text"
         app:navigationIcon="@drawable/ic_close_white_24dp"
-        app:title="@string/pin_password_toolbar_title"
+        app:title="@string/pin_password_activity_toolbar_title"
         app:titleTextAppearance="@style/ToolbarTextAppearance"
         app:titleTextColor="@color/component_color_shared_activity_toolbar_text_color" />
     </com.google.android.material.appbar.AppBarLayout>
@@ -88,7 +88,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:text="@{viewModel.profile.isAdmin ? @string/pin_password_admin_enter : @string/pin_password_user_enter}"
+            android:text="@{viewModel.profile.isAdmin ? @string/pin_password_activity_enter_text : @string/pin_password_activity_user_enter_text}"
             android:textColor="@color/component_color_shared_secondary_2_text_color"
             app:layout_constraintEnd_toEndOf="@+id/hello_text_view"
             app:layout_constraintStart_toStartOf="@+id/hello_text_view"
@@ -108,7 +108,7 @@
               android:layout_width="0dp"
               android:layout_height="wrap_content"
               android:layout_marginTop="2dp"
-              android:hint="@{viewModel.profile.isAdmin ? @string/input_pin_password_as_admin : @string/input_pin_password_as_user}"
+              android:hint="@{viewModel.profile.isAdmin ? @string/pin_password_activity_admin_input_pin_text : @string/pin_password_activity_user_input_pin_text}"
               android:minHeight="56dp"
               app:errorMessage="@{viewModel.errorMessage}"
               app:layout_constraintEnd_toStartOf="@id/show_pin"
@@ -134,7 +134,7 @@
               android:layout_marginTop="24dp"
               android:minHeight="48dp"
               android:paddingTop="8dp"
-              android:text="@string/pin_password_forgot_pin"
+              android:text="@string/pin_password_activity_forgot_pin_text"
               android:textAllCaps="true"
               android:textColor="@color/component_color_pin_password_activity_forgot_pin_color"
               app:layout_constraintEnd_toEndOf="parent"
@@ -160,7 +160,7 @@
                 android:layout_width="32dp"
                 android:layout_height="32dp"
                 android:layout_gravity="center_horizontal"
-                android:contentDescription="@{viewModel.showPassword ? @string/password_shown_icon : @string/password_hidden_icon}"
+                android:contentDescription="@{viewModel.showPassword ? @string/pin_password_activity_shown_icon_content_description : @string/pin_password_activity_hidden_icon_content_description}"
                 app:srcCompat="@{viewModel.showPassword ? @drawable/ic_show_eye_icon : @drawable/ic_hide_eye_icon}"
                 app:tint="@color/component_color_pin_password_activity_show_hide_color" />
 
@@ -172,7 +172,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="4dp"
                 android:fontFamily="sans-serif-medium"
-                android:text="@{viewModel.showPassword ? @string/pin_password_hide : @string/pin_password_show}"
+                android:text="@{viewModel.showPassword ? @string/pin_password_activity_hide_pin_text : @string/pin_password_activity_show_pin_text}"
                 android:textAllCaps="true"
                 android:textColor="@color/component_color_pin_password_activity_show_hide_color"
                 android:textSize="12sp" />
diff --git a/app/src/main/res/layout/policies_activity.xml b/app/src/main/res/layout/policies_activity.xml
index 2dd1a2dc8e0..2374db79cd8 100644
--- a/app/src/main/res/layout/policies_activity.xml
+++ b/app/src/main/res/layout/policies_activity.xml
@@ -21,7 +21,7 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:minHeight="?attr/actionBarSize"
         android:theme="@style/Widget.AppCompat.ActionBar"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="@drawable/ic_arrow_back_white_24dp"
         app:titleTextAppearance="@style/ToolbarTextAppearance" />
     </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/previous_button_item.xml b/app/src/main/res/layout/previous_button_item.xml
index 38865b2aac9..00ab3f85d30 100644
--- a/app/src/main/res/layout/previous_button_item.xml
+++ b/app/src/main/res/layout/previous_button_item.xml
@@ -45,6 +45,6 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
       app:tint="@color/component_color_shared_back_forward_arrow_button_color"
-      android:contentDescription="@string/previous_button_content_description" />
+      android:contentDescription="@string/state_fragment_previous_button_description" />
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/profile_and_device_id_activity.xml b/app/src/main/res/layout/profile_and_device_id_activity.xml
index 89e0702eebd..e72631df05e 100644
--- a/app/src/main/res/layout/profile_and_device_id_activity.xml
+++ b/app/src/main/res/layout/profile_and_device_id_activity.xml
@@ -22,7 +22,7 @@
       android:background="@color/component_color_shared_activity_toolbar_color"
       android:minHeight="?attr/actionBarSize"
       android:textSize="20sp"
-      app:navigationContentDescription="@string/navigate_up"
+      app:navigationContentDescription="@string/navigate_up_text"
       app:navigationIcon="?attr/homeAsUpIndicator"
       app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
       app:title="@string/profile_and_device_id_activity_title"
diff --git a/app/src/main/res/layout/profile_chooser_add_view.xml b/app/src/main/res/layout/profile_chooser_add_view.xml
index a9d528a2c4e..ef53182da14 100644
--- a/app/src/main/res/layout/profile_chooser_add_view.xml
+++ b/app/src/main/res/layout/profile_chooser_add_view.xml
@@ -53,7 +53,7 @@
         <TextView
           android:id="@+id/add_profile_text"
           style="@style/Caption"
-          android:text="@{hasProfileEverBeenAddedValue ? @string/profile_chooser_add : @string/set_up_multiple_profiles}"
+          android:text="@{hasProfileEverBeenAddedValue ? @string/profile_chooser_fragment_add_text : @string/profile_chooser_fragment_set_up_multiple_profiles}"
           android:textColor="@color/component_color_shared_secondary_4_text_color" />
 
         <TextView
@@ -61,7 +61,7 @@
           style="@style/TextViewStart"
           android:layout_marginTop="4dp"
           android:fontFamily="sans-serif"
-          android:text="@string/set_up_multiple_profiles_description"
+          android:text="@string/profile_chooser_fragment_add_profile_description_text"
           android:textAlignment="viewStart"
           android:textColor="@color/component_color_shared_secondary_4_text_color"
           android:textSize="12sp"
diff --git a/app/src/main/res/layout/profile_chooser_fragment.xml b/app/src/main/res/layout/profile_chooser_fragment.xml
index c9d667ec8e0..e3be972bdbc 100644
--- a/app/src/main/res/layout/profile_chooser_fragment.xml
+++ b/app/src/main/res/layout/profile_chooser_fragment.xml
@@ -37,13 +37,13 @@
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintTop_toTopOf="parent"
           app:srcCompat="@drawable/ic_language_icon_grey_24dp"
-          android:contentDescription="@string/language_icon_content_description" />
+          android:contentDescription="@string/profile_chooser_fragment_language_icon_description" />
 
         <TextView
           style="@style/Subtitle1ViewCenter"
           android:minHeight="48dp"
           android:paddingTop="20dp"
-          android:text="@string/profile_chooser_language"
+          android:text="@string/profile_chooser_fragment_language_text"
           android:textColor="@color/component_color_profile_chooser_activity_secondary_options_color"
           android:visibility="gone"
           app:layout_constraintEnd_toStartOf="@+id/profile_chooser_language_icon"
@@ -55,7 +55,7 @@
           android:layout_marginStart="36dp"
           android:layout_marginTop="@dimen/profile_chooser_fragment_profile_select_text_margin_top"
           android:layout_marginEnd="36dp"
-          android:text="@string/profile_chooser_select"
+          android:text="@string/profile_chooser_fragment_select_text"
           android:textColor="@color/component_color_shared_secondary_4_text_color"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toTopOf="parent" />
@@ -103,7 +103,7 @@
         style="@style/Subtitle1ViewCenter"
         android:layout_marginBottom="24dp"
         android:minHeight="48dp"
-        android:text="@string/profile_chooser_administrator_controls"
+        android:text="@string/profile_chooser_fragment_administrator_controls_text"
         android:textColor="@color/component_color_profile_chooser_activity_secondary_options_color" />
 
       <ImageView
@@ -117,7 +117,7 @@
         android:paddingEnd="16dp"
         android:paddingBottom="12dp"
         app:srcCompat="@drawable/ic_settings_grey_48dp"
-        android:contentDescription="@string/setting_icon_content_description" />
+        android:contentDescription="@string/profile_chooser_fragment_setting_icon_description" />
     </LinearLayout>
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/profile_chooser_profile_view.xml b/app/src/main/res/layout/profile_chooser_profile_view.xml
index 2a3fdfb8881..20b42980c07 100644
--- a/app/src/main/res/layout/profile_chooser_profile_view.xml
+++ b/app/src/main/res/layout/profile_chooser_profile_view.xml
@@ -84,7 +84,7 @@
           android:layout_height="wrap_content"
           android:layout_marginTop="@dimen/profile_chooser_profile_view_is_admin_margin_top"
           android:gravity="@{hasProfileEverBeenAddedValue ? Gravity.CENTER_HORIZONTAL : Gravity.CENTER_VERTICAL}"
-          android:text="@string/profile_chooser_admin"
+          android:text="@string/profile_chooser_fragment_admin_text"
           android:textColor="@color/component_color_shared_secondary_4_text_color"
           android:visibility="@{viewModel.profile.isAdmin ? View.VISIBLE : View.GONE}" />
       </LinearLayout>
diff --git a/app/src/main/res/layout/profile_edit_activity.xml b/app/src/main/res/layout/profile_edit_activity.xml
index 37cf5d2bfe2..92c79100f17 100644
--- a/app/src/main/res/layout/profile_edit_activity.xml
+++ b/app/src/main/res/layout/profile_edit_activity.xml
@@ -22,7 +22,7 @@
       android:background="@color/component_color_shared_activity_toolbar_color"
       android:minHeight="?attr/actionBarSize"
       android:textSize="20sp"
-      app:navigationContentDescription="@string/navigate_up"
+      app:navigationContentDescription="@string/navigate_up_text"
       app:navigationIcon="?attr/homeAsUpIndicator"
       app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
       app:titleTextAppearance="@style/ToolbarTextAppearance" />
diff --git a/app/src/main/res/layout/profile_edit_fragment.xml b/app/src/main/res/layout/profile_edit_fragment.xml
index 6bcf79c0286..7e88a038a3e 100644
--- a/app/src/main/res/layout/profile_edit_fragment.xml
+++ b/app/src/main/res/layout/profile_edit_fragment.xml
@@ -88,7 +88,7 @@
         android:minHeight="48dp"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:text="@string/profile_edit_rename"
+        android:text="@string/profile_edit_activity_rename_text"
         android:textAllCaps="false"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="16sp"
@@ -107,7 +107,7 @@
         android:minHeight="48dp"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:text="@string/profile_edit_reset"
+        android:text="@string/profile_edit_activity_reset_text"
         android:textAllCaps="false"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="16sp"
@@ -126,7 +126,7 @@
         android:minHeight="48dp"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:text="@string/profile_edit_mark_chapter_completion"
+        android:text="@string/profile_edit_activity_mark_chapters_for_completion_button_text"
         android:textAllCaps="false"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="16sp"
@@ -156,7 +156,7 @@
           android:paddingStart="16dp"
           android:paddingTop="12dp"
           android:paddingEnd="24dp"
-          android:text="@string/profile_edit_enable_quick_lesson_language_switching_label"
+          android:text="@string/profile_edit_activity_switching_header_text"
           android:textColor="@color/component_color_shared_primary_text_color"
           android:textSize="16sp"
           app:layout_constraintEnd_toStartOf="@+id/profile_edit_enable_in_lesson_language_switching_switch"
@@ -173,7 +173,7 @@
           android:paddingStart="16dp"
           android:paddingEnd="24dp"
           android:paddingBottom="12dp"
-          android:text="@string/profile_edit_enable_quick_lesson_language_switching_explanation"
+          android:text="@string/profile_edit_activity_switching_label_text"
           android:textColor="@color/component_color_shared_secondary_3_text_color"
           android:textSize="14sp"
           app:layout_constraintEnd_toStartOf="@+id/profile_edit_enable_in_lesson_language_switching_switch"
@@ -217,7 +217,7 @@
           android:paddingStart="16dp"
           android:paddingTop="12dp"
           android:paddingEnd="24dp"
-          android:text="@string/profile_edit_allow_download_heading"
+          android:text="@string/profile_edit_activity_allow_download_heading"
           android:textColor="@color/component_color_shared_primary_text_color"
           android:textSize="16sp"
           app:layout_constraintEnd_toStartOf="@+id/profile_edit_allow_download_switch"
@@ -234,7 +234,7 @@
           android:paddingStart="16dp"
           android:paddingEnd="24dp"
           android:paddingBottom="12dp"
-          android:text="@string/profile_edit_allow_download_sub"
+          android:text="@string/profile_edit_activity_allow_download_sub"
           android:textColor="@color/component_color_shared_secondary_3_text_color"
           android:textSize="14sp"
           app:layout_constraintEnd_toStartOf="@+id/profile_edit_allow_download_switch"
@@ -269,7 +269,7 @@
         android:minHeight="48dp"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:text="@string/profile_edit_delete"
+        android:text="@string/profile_edit_activity_delete_button_text"
         android:textAllCaps="false"
         android:textColor="@color/component_color_profile_edit_activity_delete_button_text_color"
         android:textSize="16sp"
diff --git a/app/src/main/res/layout/profile_list_fragment.xml b/app/src/main/res/layout/profile_list_fragment.xml
index edbeb1d6cbc..409124a52e0 100644
--- a/app/src/main/res/layout/profile_list_fragment.xml
+++ b/app/src/main/res/layout/profile_list_fragment.xml
@@ -29,7 +29,7 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator"
         app:title="@string/profile_list_activity_title"
         app:titleTextAppearance="@style/ToolbarTextAppearance" />
diff --git a/app/src/main/res/layout/profile_list_profile_view.xml b/app/src/main/res/layout/profile_list_profile_view.xml
index 12c57793c30..fb906d8e72b 100644
--- a/app/src/main/res/layout/profile_list_profile_view.xml
+++ b/app/src/main/res/layout/profile_list_profile_view.xml
@@ -56,7 +56,7 @@
       android:layout_marginStart="20dp"
       android:layout_marginEnd="20dp"
       android:fontFamily="sans-serif"
-      android:text="@string/profile_chooser_admin"
+      android:text="@string/profile_chooser_fragment_admin_text"
       android:textColor="@color/component_color_profile_list_activity_profile_view_designation_text_color"
       android:textSize="12sp"
       android:textStyle="italic"
diff --git a/app/src/main/res/layout/profile_picture_activity.xml b/app/src/main/res/layout/profile_picture_activity.xml
index 82932006341..496ff44fc0a 100644
--- a/app/src/main/res/layout/profile_picture_activity.xml
+++ b/app/src/main/res/layout/profile_picture_activity.xml
@@ -31,7 +31,7 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         app:title="@string/profile_picture_activity_title"
@@ -49,7 +49,7 @@
       app:layout_constraintTop_toBottomOf="@id/profile_picture_activity_app_bar_layout"
       profile:src="@{viewModel.profileAvatar}"
       tools:src="@drawable/ic_default_avatar"
-      android:contentDescription="@string/profile_picture_image_view_content_description" />
+      android:contentDescription="@string/profile_picture_activity_profile_picture_description" />
 
     <View
       android:id="@+id/app_version_shadow_view"
diff --git a/app/src/main/res/layout/profile_picture_edit_dialog.xml b/app/src/main/res/layout/profile_picture_edit_dialog.xml
index 7abce64f6f1..79047696193 100644
--- a/app/src/main/res/layout/profile_picture_edit_dialog.xml
+++ b/app/src/main/res/layout/profile_picture_edit_dialog.xml
@@ -14,7 +14,7 @@
     android:fontFamily="sans-serif"
     android:paddingTop="24dp"
     android:paddingBottom="12dp"
-    android:text="@string/profile_picture_edit_alert_dialog_view_profile_picture"
+    android:text="@string/profile_picture_edit_dialog_view_picture_text"
     android:textColor="@color/component_color_shared_primary_dark_text_color"
     android:textSize="16sp" />
 
@@ -28,7 +28,7 @@
     android:fontFamily="sans-serif"
     android:paddingTop="12dp"
     android:paddingBottom="16dp"
-    android:text="@string/profile_picture_edit_alert_dialog_choose_from_library"
+    android:text="@string/profile_picture_edit_dialog_change_picture_text"
     android:textColor="@color/component_color_shared_primary_dark_text_color"
     android:textSize="16sp" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/profile_progress_header.xml b/app/src/main/res/layout/profile_progress_header.xml
index b00c0202333..7a3d6c7188b 100644
--- a/app/src/main/res/layout/profile_progress_header.xml
+++ b/app/src/main/res/layout/profile_progress_header.xml
@@ -25,7 +25,7 @@
       android:layout_width="100dp"
       android:layout_height="100dp"
       android:clickable="true"
-      android:contentDescription="@string/current_profile_picture_content_description"
+      android:contentDescription="@string/add_profile_activity_edit_image_content_description"
       android:elevation="4dp"
       android:focusable="true"
       android:onClick="@{() -> viewModel.clickOnProfilePicture()}"
@@ -40,7 +40,7 @@
     <ImageView
       android:layout_width="48dp"
       android:layout_height="48dp"
-      android:contentDescription="@string/edit_profile_picture_content_description"
+      android:contentDescription="@string/add_profile_activity_edit_user_image_content_description"
       android:elevation="4dp"
       android:onClick="@{() -> viewModel.clickOnProfilePicture()}"
       android:paddingStart="8dp"
@@ -111,7 +111,7 @@
           android:layout_height="wrap_content"
           android:fontFamily="sans-serif"
           android:minWidth="60dp"
-          android:text="@{viewModel.ongoingTopicCount != 1 ? @string/topics_in_progress : @string/topic_in_progress}"
+          android:text="@{viewModel.ongoingTopicCount != 1 ? @string/profile_progress_activity_topics_in_progress_text : @string/profile_progress_activity_topic_in_progress_text}"
           android:textColor="@color/component_color_shared_primary_text_color"
           android:textSize="12sp" />
       </LinearLayout>
@@ -161,7 +161,7 @@
           android:layout_height="wrap_content"
           android:fontFamily="sans-serif"
           android:minWidth="60dp"
-          android:text="@{viewModel.completedStoryCount != 1 ? @string/stories_completed : @string/story_completed}"
+          android:text="@{viewModel.completedStoryCount != 1 ? @string/profile_progress_activity_stories_completed_text : @string/profile_progress_activity_story_completed_text}"
           android:textColor="@color/component_color_shared_primary_text_color"
           android:textSize="12sp" />
       </LinearLayout>
@@ -176,7 +176,7 @@
       android:layout_marginTop="64dp"
       android:fontFamily="sans-serif-medium"
       android:minHeight="48dp"
-      android:text="@string/recently_played_stories"
+      android:text="@string/home_activity_recently_played_stories"
       android:textColor="@color/component_color_shared_primary_text_color"
       android:textSize="18sp"
       android:visibility="@{viewModel.headerTextVisibility}"
@@ -195,7 +195,7 @@
       android:fontFamily="sans-serif-medium"
       android:minHeight="48dp"
       android:onClick="@{() -> viewModel.clickOnViewAll()}"
-      android:text="@string/view_all"
+      android:text="@string/home_activity_view_all_text"
       android:textAllCaps="true"
       android:textColor="@color/component_color_profile_progress_activity_view_all_text_color"
       android:textSize="14sp"
diff --git a/app/src/main/res/layout/profile_rename_activity.xml b/app/src/main/res/layout/profile_rename_activity.xml
index 8e480b44eb0..bde248fd3aa 100644
--- a/app/src/main/res/layout/profile_rename_activity.xml
+++ b/app/src/main/res/layout/profile_rename_activity.xml
@@ -22,7 +22,7 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator"
         app:title="@string/profile_rename_activity_title"
         app:titleTextAppearance="@style/ToolbarTextAppearance" />
diff --git a/app/src/main/res/layout/profile_rename_fragment.xml b/app/src/main/res/layout/profile_rename_fragment.xml
index 2c78c153a4b..b8cc4a32f76 100644
--- a/app/src/main/res/layout/profile_rename_fragment.xml
+++ b/app/src/main/res/layout/profile_rename_fragment.xml
@@ -33,7 +33,7 @@
         android:layout_marginStart="@dimen/profile_rename_activity_profile_rename_input_margin_start"
         android:layout_marginTop="@dimen/profile_rename_activity_profile_rename_input_margin_top"
         android:layout_marginEnd="@dimen/profile_rename_activity_profile_rename_input_margin_end"
-        android:hint="@string/profile_rename_label"
+        android:hint="@string/profile_rename_activity_rename_input_hint"
         app:errorMessage="@{viewModel.nameErrorMsg}"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -60,7 +60,7 @@
         android:background="@{viewModel.inputName.length > 0 ? @drawable/state_button_primary_background : @drawable/start_button_transparent_background}"
         android:clickable="@{viewModel.inputName.length > 0}"
         android:enabled="@{viewModel.inputName.length > 0}"
-        android:text="@string/profile_rename_save"
+        android:text="@string/profile_rename_activity_rename_save_button"
         android:textColor="@{viewModel.inputName.length > 0 ? @color/component_color_shared_secondary_4_text_color : @color/component_color_shared_button_inactive_text_color }"
         android:textSize="14sp"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/profile_reset_pin_activity.xml b/app/src/main/res/layout/profile_reset_pin_activity.xml
index e0db12b742a..65aef56b5db 100644
--- a/app/src/main/res/layout/profile_reset_pin_activity.xml
+++ b/app/src/main/res/layout/profile_reset_pin_activity.xml
@@ -23,7 +23,7 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator"
         app:title="@string/profile_reset_pin_activity_title"
         app:titleTextAppearance="@style/ToolbarTextAppearance" />
diff --git a/app/src/main/res/layout/profile_reset_pin_fragment.xml b/app/src/main/res/layout/profile_reset_pin_fragment.xml
index 009f5ca5388..a472f00f879 100644
--- a/app/src/main/res/layout/profile_reset_pin_fragment.xml
+++ b/app/src/main/res/layout/profile_reset_pin_fragment.xml
@@ -39,7 +39,7 @@
           android:layout_marginTop="36dp"
           android:paddingStart="@dimen/profile_reset_pin_activity_profile_reset_pin_main_padding_start"
           android:paddingEnd="@dimen/profile_reset_pin_activity_profile_reset_pin_main_padding_end"
-          android:text="@string/profile_reset_pin_main"
+          android:text="@string/profile_reset_pin_fragment_reset_pin_main_text"
           android:textColor="@color/component_color_shared_primary_text_color"
           android:textSize="16sp"
           app:layout_constraintEnd_toEndOf="parent"
@@ -54,7 +54,7 @@
           android:layout_marginStart="@dimen/profile_reset_pin_activity_profile_reset_input_pin_margin_start"
           android:layout_marginTop="@dimen/profile_reset_pin_activity_profile_reset_input_pin_margin_top"
           android:layout_marginEnd="@dimen/profile_reset_pin_activity_profile_reset_input_pin_margin_end"
-          android:hint="@{viewModel.isAdmin ? @string/profile_reset_pin_admin_pin_label : @string/profile_reset_pin_user_pin_label}"
+          android:hint="@{viewModel.isAdmin ? @string/profile_reset_pin_fragment_admin_pin_text : @string/profile_reset_pin_fragment_user_pin_text}"
           app:errorMessage="@{viewModel.pinErrorMsg}"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintStart_toStartOf="parent"
@@ -78,7 +78,7 @@
           android:layout_marginStart="@dimen/profile_reset_pin_activity_profile_reset_input_confirm_pin_margin_start"
           android:layout_marginTop="@dimen/profile_reset_pin_activity_profile_reset_input_confirm_pin_margin_top"
           android:layout_marginEnd="@dimen/profile_reset_pin_activity_profile_reset_input_confirm_pin_margin_end"
-          android:hint="@{viewModel.isAdmin ? @string/profile_reset_pin_admin_confirm_label : @string/profile_reset_pin_user_confirm_label}"
+          android:hint="@{viewModel.isAdmin ? @string/profile_reset_pin_fragment_admin_confirm_text : @string/profile_reset_pin_fragment_user_confirm_text}"
           app:errorMessage="@{viewModel.confirmErrorMsg}"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintStart_toStartOf="parent"
@@ -104,7 +104,7 @@
           android:background="@{viewModel.isButtonActive() ? @drawable/state_button_primary_background : @drawable/start_button_transparent_background}"
           android:clickable="@{viewModel.isButtonActive()}"
           android:enabled="@{viewModel.isButtonActive()}"
-          android:text="@string/profile_rename_save"
+          android:text="@string/profile_rename_activity_rename_save_button"
           android:textColor="@{viewModel.isButtonActive() ? @color/component_color_shared_secondary_4_text_color : @color/component_color_shared_button_inactive_text_color }"
           app:layout_constraintEnd_toEndOf="parent"
           app:layout_constraintTop_toBottomOf="@id/profile_reset_input_confirm_pin" />
diff --git a/app/src/main/res/layout/promoted_story_list.xml b/app/src/main/res/layout/promoted_story_list.xml
index 786d5a0d4ca..da042ab8982 100644
--- a/app/src/main/res/layout/promoted_story_list.xml
+++ b/app/src/main/res/layout/promoted_story_list.xml
@@ -46,7 +46,7 @@
         android:gravity="center_vertical"
         android:minHeight="48dp"
         android:onClick="@{() -> viewModel.clickOnViewAll()}"
-        android:text="@string/view_all"
+        android:text="@string/home_activity_view_all_text"
         android:textAllCaps="true"
         android:textColor="@color/component_color_home_activity_view_all_text_color"
         android:textSize="14sp"
diff --git a/app/src/main/res/layout/question_player_activity.xml b/app/src/main/res/layout/question_player_activity.xml
index 3f48a39174c..deb9fcc7866 100644
--- a/app/src/main/res/layout/question_player_activity.xml
+++ b/app/src/main/res/layout/question_player_activity.xml
@@ -24,7 +24,7 @@
         android:minHeight="?attr/actionBarSize"
         android:theme="@style/Widget.AppCompat.ActionBar"
         app:navigationIcon="@drawable/ic_close_white_24dp"
-        app:title="@string/question_player_title"
+        app:title="@string/exploration_activity_question_player_title"
         app:titleTextAppearance="@style/ToolbarTextAppearance" />
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/question_player_fragment.xml b/app/src/main/res/layout/question_player_fragment.xml
index 0cf3ffeec1b..2297258519f 100644
--- a/app/src/main/res/layout/question_player_fragment.xml
+++ b/app/src/main/res/layout/question_player_fragment.xml
@@ -29,7 +29,7 @@
         android:layout_marginTop="28dp"
         android:layout_marginEnd="28dp"
         android:fontFamily="sans-serif"
-        android:text="@string/question_training_session_finished_header"
+        android:text="@string/topic_fragment_question_end_session_header_text"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="24sp"
         android:visibility="gone"
@@ -44,7 +44,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="28dp"
         android:fontFamily="sans-serif"
-        android:text="@string/question_training_session_finished_message"
+        android:text="@string/topic_fragment_question_end_session_body_text"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="16sp"
         android:visibility="gone"
@@ -127,7 +127,7 @@
           android:layout_height="6dp"
           android:layout_gravity="top|end"
           android:layout_margin="8dp"
-          android:contentDescription="@string/new_hint_available"
+          android:contentDescription="@string/question_player_activity_new_hint_available_text"
           android:visibility="@{viewModel.isHintOpenedAndUnRevealed() ? View.VISIBLE : View.GONE}"
           app:srcCompat="@drawable/ic_dot_yellow_24dp" />
 
@@ -136,7 +136,7 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_margin="12dp"
-          android:contentDescription="@string/show_hints_and_solution"
+          android:contentDescription="@string/state_fragment_open_hint_content_description"
           app:srcCompat="@drawable/ic_hint_bulb_white_24dp" />
       </FrameLayout>
 
diff --git a/app/src/main/res/layout/reading_text_size_activity.xml b/app/src/main/res/layout/reading_text_size_activity.xml
index b669ced61ed..0f74af478f1 100644
--- a/app/src/main/res/layout/reading_text_size_activity.xml
+++ b/app/src/main/res/layout/reading_text_size_activity.xml
@@ -20,9 +20,9 @@
       android:background="@color/component_color_shared_activity_toolbar_color"
       android:fontFamily="sans-serif"
       android:minHeight="?attr/actionBarSize"
-      app:navigationContentDescription="@string/navigate_up"
+      app:navigationContentDescription="@string/navigate_up_text"
       app:navigationIcon="?attr/homeAsUpIndicator"
-      app:title="@string/title_reading_text_size"
+      app:title="@string/reading_text_size_activity_title"
       app:titleTextAppearance="@style/ToolbarTextAppearance" />
   </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/recently_played_activity.xml b/app/src/main/res/layout/recently_played_activity.xml
index 16da7a9042b..14247d62950 100644
--- a/app/src/main/res/layout/recently_played_activity.xml
+++ b/app/src/main/res/layout/recently_played_activity.xml
@@ -22,9 +22,9 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator"
-        app:title="@string/recently_played_activity"
+        app:title="@string/recently_played_activity_title"
         app:titleTextAppearance="@style/ToolbarTextAppearance" />
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/replay_button_item.xml b/app/src/main/res/layout/replay_button_item.xml
index 83ac66ed6b7..dbe422b690a 100644
--- a/app/src/main/res/layout/replay_button_item.xml
+++ b/app/src/main/res/layout/replay_button_item.xml
@@ -26,7 +26,7 @@
       android:onClick="@{(v) -> buttonViewModel.replayButtonListener.onReplayButtonClicked()}"
       android:paddingStart="24dp"
       android:paddingEnd="24dp"
-      android:text="@string/lesson_replay_button_text"
+      android:text="@string/state_fragment_replay_button_text"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/resume_lesson_activity.xml b/app/src/main/res/layout/resume_lesson_activity.xml
index f15c5c409b0..3948eeac9f0 100644
--- a/app/src/main/res/layout/resume_lesson_activity.xml
+++ b/app/src/main/res/layout/resume_lesson_activity.xml
@@ -21,7 +21,7 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:minHeight="?attr/actionBarSize"
         android:theme="@style/Widget.AppCompat.ActionBar"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator"
         app:title="@string/resume_lesson_activity_title"
         app:titleTextAppearance="@style/ToolbarTextAppearance" />
diff --git a/app/src/main/res/layout/resume_lesson_fragment.xml b/app/src/main/res/layout/resume_lesson_fragment.xml
index 9b07c7743ba..61acada3db5 100644
--- a/app/src/main/res/layout/resume_lesson_fragment.xml
+++ b/app/src/main/res/layout/resume_lesson_fragment.xml
@@ -95,7 +95,7 @@
           android:gravity="center"
           android:minWidth="144dp"
           android:minHeight="@dimen/clickable_item_min_height"
-          android:text="@string/start_over_lesson_button"
+          android:text="@string/resume_lessons_fragment_start_over_button_text"
           android:textAllCaps="false"
           android:textColor="@color/component_color_shared_secondary_button_background_trim_color"
           android:textSize="14sp"
@@ -113,7 +113,7 @@
           android:gravity="center"
           android:minWidth="144dp"
           android:minHeight="@dimen/clickable_item_min_height"
-          android:text="@string/resume_lesson_button"
+          android:text="@string/resume_lessons_fragment_continue_button_text"
           android:textAllCaps="false"
           android:textColor="@color/component_color_shared_secondary_4_text_color"
           android:textSize="14sp"
diff --git a/app/src/main/res/layout/return_to_lesson_button_item.xml b/app/src/main/res/layout/return_to_lesson_button_item.xml
index 7ad7a8b0826..f9b4849c3af 100644
--- a/app/src/main/res/layout/return_to_lesson_button_item.xml
+++ b/app/src/main/res/layout/return_to_lesson_button_item.xml
@@ -20,5 +20,5 @@
     android:paddingTop="8dp"
     android:paddingEnd="24dp"
     android:paddingBottom="8dp"
-    android:text="@string/return_to_lesson" />
+    android:text="@string/hint_solution_dialog_return_to_lesson_button" />
 </layout>
diff --git a/app/src/main/res/layout/return_to_topic_button_item.xml b/app/src/main/res/layout/return_to_topic_button_item.xml
index 1ac496459a9..324e8a646e4 100644
--- a/app/src/main/res/layout/return_to_topic_button_item.xml
+++ b/app/src/main/res/layout/return_to_topic_button_item.xml
@@ -28,7 +28,7 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
       app:tint="@color/component_color_shared_back_forward_arrow_button_color"
-      android:contentDescription="@string/previous_button_content_description" />
+      android:contentDescription="@string/state_fragment_previous_button_description" />
 
     <Button
       android:id="@+id/return_to_topic_button"
@@ -36,7 +36,7 @@
       android:onClick="@{(v) -> buttonViewModel.returnToTopicNavigationButtonListener.onReturnToTopicButtonClicked()}"
       android:paddingStart="32dp"
       android:paddingEnd="32dp"
-      android:text="@string/state_end_exploration_button"
+      android:text="@string/state_fragment_return_to_topic_button_text"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/revision_card_activity.xml b/app/src/main/res/layout/revision_card_activity.xml
index be55a492996..9c06766ad5c 100644
--- a/app/src/main/res/layout/revision_card_activity.xml
+++ b/app/src/main/res/layout/revision_card_activity.xml
@@ -26,7 +26,7 @@
         android:gravity="center_vertical"
         android:minHeight="?attr/actionBarSize"
         android:theme="@style/Widget.AppCompat.ActionBar"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator">
 
         <ImageButton
diff --git a/app/src/main/res/layout/revision_card_fragment.xml b/app/src/main/res/layout/revision_card_fragment.xml
index 4377d955871..b1a22c744dc 100644
--- a/app/src/main/res/layout/revision_card_fragment.xml
+++ b/app/src/main/res/layout/revision_card_fragment.xml
@@ -45,7 +45,7 @@
           android:layout_height="wrap_content"
           android:layout_marginStart="28dp"
           android:layout_marginEnd="28dp"
-          android:text="@string/revision_navigation_cards_header"
+          android:text="@string/revision_card_fragment_continue_studying_text"
           android:textAlignment="@{viewModel.subtopicId == 1 ? View.TEXT_ALIGNMENT_TEXT_END : View.TEXT_ALIGNMENT_TEXT_START}"
           android:textColor="@color/component_color_shared_primary_text_color"
           android:textSize="20sp"
diff --git a/app/src/main/res/layout/solution_summary.xml b/app/src/main/res/layout/solution_summary.xml
index 9a6e50ed026..737bb148e85 100644
--- a/app/src/main/res/layout/solution_summary.xml
+++ b/app/src/main/res/layout/solution_summary.xml
@@ -58,7 +58,7 @@
             android:layout_marginTop="20dp"
             android:layout_marginBottom="16dp"
             android:fontFamily="sans-serif-medium"
-            android:text="@string/hint_list_solution_title"
+            android:text="@string/hint_solution_dialog_solution_text"
             android:textColor="@color/component_color_hints_and_solutions_fragment_text_color"
             android:textSize="20sp"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -77,7 +77,7 @@
             android:paddingTop="8dp"
             android:paddingEnd="16dp"
             android:paddingBottom="8dp"
-            android:text="@string/show_solution"
+            android:text="@string/hint_solution_dialog_show_solution_text"
             android:textColor="@color/component_color_hints_and_solution_summary_button_text_color"
             android:textSize="14sp"
             android:textAllCaps="false"
@@ -98,7 +98,7 @@
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"
             android:background="@color/component_color_shared_transparent_background_color"
-            android:contentDescription="@{isListExpanded? @string/hide_solution : @string/show_solution}"
+            android:contentDescription="@{isListExpanded? @string/hint_solution_dialog_hide_solution_description : @string/hint_solution_dialog_show_solution_text}"
             android:minWidth="48dp"
             android:minHeight="48dp"
             android:padding="8dp"
@@ -156,7 +156,7 @@
               android:layout_height="wrap_content"
               android:layout_marginTop="@dimen/solution_summary_margin_top_solution_summary_label"
               android:fontFamily="sans-serif-color_def_black"
-              android:text="@string/explanation"
+              android:text="@string/hint_solution_dialog_explanation_text"
               android:textColor="@color/component_color_hints_and_solutions_fragment_description_color"
               android:textSize="16sp" />
 
diff --git a/app/src/main/res/layout/splash_activity.xml b/app/src/main/res/layout/splash_activity.xml
index 14b1e498474..098e539333d 100644
--- a/app/src/main/res/layout/splash_activity.xml
+++ b/app/src/main/res/layout/splash_activity.xml
@@ -48,7 +48,7 @@
       style="@style/Heading2ViewStart"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:text="@{isOnAlphaFlavor ? @string/splash_screen_alpha_label : isOnBetaFlavor ? @string/splash_screen_beta_label : @string/splash_screen_developer_label}"
+      android:text="@{isOnAlphaFlavor ? @string/splash_activity_build_alpha_label : isOnBetaFlavor ? @string/splash_activity_build_beta_label : @string/splash_activity_build_developer_label}"
       android:textColor="@color/component_color_shared_secondary_4_text_color"
       android:textSize="24sp"
       android:visibility="@{(isOnDeveloperFlavor || isOnAlphaFlavor || isOnBetaFlavor) ? View.VISIBLE : View.GONE}"
diff --git a/app/src/main/res/layout/spotlight_fragment_test_activity.xml b/app/src/main/res/layout/spotlight_fragment_test_activity.xml
index 371d51c0430..c57e8062a6d 100644
--- a/app/src/main/res/layout/spotlight_fragment_test_activity.xml
+++ b/app/src/main/res/layout/spotlight_fragment_test_activity.xml
@@ -15,7 +15,7 @@
       android:id="@+id/sample_spotlight_target"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:text="@string/sample_text_view_text"
+      android:text="@string/spotlight_fragment_test_sample_view_text"
       style="@style/TextViewStart"
       android:layout_marginTop="80dp"
       android:layout_marginStart="80dp"
diff --git a/app/src/main/res/layout/state_fragment.xml b/app/src/main/res/layout/state_fragment.xml
index dda21b4db6b..edfec47b8df 100755
--- a/app/src/main/res/layout/state_fragment.xml
+++ b/app/src/main/res/layout/state_fragment.xml
@@ -151,7 +151,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="8dp"
-            android:contentDescription="@{viewModel.isHintOpenedAndUnRevealed() ? @string/new_hint_available : @string/no_new_hint_available}"
+            android:contentDescription="@{viewModel.isHintOpenedAndUnRevealed() ? @string/question_player_activity_new_hint_available_text : @string/state_fragment_hint_bulb_content_description}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -162,7 +162,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:text="@string/hints_toolbar_title"
+            android:text="@string/state_fragment_hint_bar_title"
             android:textColor="@color/component_color_shared_secondary_4_text_color"
             android:textSize="24sp"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -174,7 +174,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="8dp"
-            android:contentDescription="@string/show_hints_and_solution"
+            android:contentDescription="@string/state_fragment_open_hint_content_description"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/state_fragment_test_activity.xml b/app/src/main/res/layout/state_fragment_test_activity.xml
index 300bfc41478..8cc7a2d8fd6 100644
--- a/app/src/main/res/layout/state_fragment_test_activity.xml
+++ b/app/src/main/res/layout/state_fragment_test_activity.xml
@@ -31,7 +31,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="16dp"
-      android:text="@string/play_exploration_button_text"
+      android:text="@string/exploration_activity_play_button_text"
       android:textAllCaps="false"
       android:visibility="@{viewModel.hasExplorationStarted ? View.GONE : View.VISIBLE}" />
   </FrameLayout>
diff --git a/app/src/main/res/layout/story_chapter_view.xml b/app/src/main/res/layout/story_chapter_view.xml
index e606cc13c39..4f6b8bcb503 100644
--- a/app/src/main/res/layout/story_chapter_view.xml
+++ b/app/src/main/res/layout/story_chapter_view.xml
@@ -74,7 +74,7 @@
           app:layout_constraintStart_toStartOf="@id/chapter_thumbnail"
           app:layout_constraintTop_toTopOf="@id/chapter_thumbnail"
           app:srcCompat="@drawable/ic_baseline_lock_24"
-          android:contentDescription="@string/lock_icon_content_description" />
+          android:contentDescription="@string/story_fragment_lock_icon_content_description" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
           android:layout_width="match_parent"
@@ -125,7 +125,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="4dp"
-            android:contentDescription="@{@string/chapter_completed}"
+            android:contentDescription="@{@string/topic_fragment_lessons_chapter_completed_text}"
             android:visibility="@{viewModel.chapterSummary.chapterPlayState == ChapterPlayState.COMPLETED ? View.VISIBLE : View.GONE}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/story_fragment.xml b/app/src/main/res/layout/story_fragment.xml
index 1d5c4f5a61a..b64cb3f1d53 100644
--- a/app/src/main/res/layout/story_fragment.xml
+++ b/app/src/main/res/layout/story_fragment.xml
@@ -33,7 +33,7 @@
         android:gravity="center_vertical"
         android:minHeight="?attr/actionBarSize"
         android:theme="@style/Widget.AppCompat.ActionBar"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator">
 
         <TextView
diff --git a/app/src/main/res/layout/submit_button_item.xml b/app/src/main/res/layout/submit_button_item.xml
index b8788118fcb..820ba6f536f 100644
--- a/app/src/main/res/layout/submit_button_item.xml
+++ b/app/src/main/res/layout/submit_button_item.xml
@@ -46,7 +46,7 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
       app:tint="@color/component_color_shared_back_forward_arrow_button_color"
-      android:contentDescription="@string/previous_button_content_description" />
+      android:contentDescription="@string/state_fragment_previous_button_description" />
 
     <Button
       android:id="@+id/submit_answer_button"
@@ -55,7 +55,7 @@
       android:button="@drawable/state_button_primary_background"
       android:enabled="@{buttonViewModel.canSubmitAnswer}"
       android:onClick="@{(v) -> buttonViewModel.submitNavigationButtonListener.onSubmitButtonClicked()}"
-      android:text="@string/state_submit_button"
+      android:text="@string/state_fragment_submit_button_text"
       android:textColor="@{buttonViewModel.canSubmitAnswer ? @color/component_color_shared_submit_text_active_color : @color/component_color_shared_submit_text_inactive_color}"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/submitted_answer_item.xml b/app/src/main/res/layout/submitted_answer_item.xml
index eea505bac12..f4507217233 100644
--- a/app/src/main/res/layout/submitted_answer_item.xml
+++ b/app/src/main/res/layout/submitted_answer_item.xml
@@ -64,7 +64,7 @@
       android:id="@+id/submitted_answer_recycler_view_container"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:contentDescription="@{viewModel.isCorrectAnswer ? @string/correct_submitted_answer : @string/incorrect_submitted_answer}"
+      android:contentDescription="@{viewModel.isCorrectAnswer ? @string/state_fragment_correct_submitted_answer : @string/state_fragment_incorrect_submitted_answer}"
       android:orientation="vertical"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent">
diff --git a/app/src/main/res/layout/survey_exit_confirmation_dialog.xml b/app/src/main/res/layout/survey_exit_confirmation_dialog.xml
index fbbfe690df1..aa5e567cad4 100644
--- a/app/src/main/res/layout/survey_exit_confirmation_dialog.xml
+++ b/app/src/main/res/layout/survey_exit_confirmation_dialog.xml
@@ -13,7 +13,7 @@
       android:layout_height="wrap_content"
       android:layout_marginStart="@dimen/survey_question_text_margin"
       android:layout_marginEnd="@dimen/survey_question_text_margin"
-      android:text="@string/survey_exit_confirmation_text"
+      android:text="@string/survey_activity_exit_dialog_confirmation_text"
       app:layout_constraintTop_toTopOf="parent" />
 
     <Button
@@ -21,7 +21,7 @@
       style="@style/SurveySecondaryButton"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:text="@string/survey_continue_survey_button"
+      android:text="@string/survey_activity_exit_dialog_continue_button"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@id/exit_survey_confirmation_text" />
@@ -31,7 +31,7 @@
       style="@style/SurveyPrimaryButton"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:text="@string/survey_exit_button"
+      android:text="@string/survey_activity_exit_dialog_exit_button"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/survey_fragment.xml b/app/src/main/res/layout/survey_fragment.xml
index f96a442a1d9..052877a654a 100644
--- a/app/src/main/res/layout/survey_fragment.xml
+++ b/app/src/main/res/layout/survey_fragment.xml
@@ -29,7 +29,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/component_color_shared_activity_toolbar_color"
-        android:contentDescription="@string/survey_exit_button_description"
+        android:contentDescription="@string/survey_activity_exit_dialog_exit_button_description"
         android:minHeight="?attr/actionBarSize"
         android:theme="@style/Widget.AppCompat.ActionBar"
         app:navigationIcon="@drawable/ic_close_white_24dp">
@@ -120,7 +120,7 @@
           style="@style/SurveyPreviousButton"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:text="@string/survey_previous_button"
+          android:text="@string/survey_fragment_previous_button"
           app:layout_constraintBottom_toBottomOf="parent"
           app:layout_constraintStart_toStartOf="parent" />
 
@@ -131,7 +131,7 @@
           android:layout_height="wrap_content"
           android:background="@{viewModel.canMoveToNextQuestion ? @drawable/state_button_primary_background : @drawable/state_button_inactive_background}"
           android:enabled="@{viewModel.canMoveToNextQuestion}"
-          android:text="@string/next"
+          android:text="@string/next_text"
           android:textColor="@{viewModel.canMoveToNextQuestion ? @color/component_color_shared_secondary_4_text_color : @color/component_color_survey_disabled_button_text_color}"
           app:layout_constraintBottom_toBottomOf="parent"
           app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/survey_free_form_layout.xml b/app/src/main/res/layout/survey_free_form_layout.xml
index fb915d5a13c..10211719e72 100644
--- a/app/src/main/res/layout/survey_free_form_layout.xml
+++ b/app/src/main/res/layout/survey_free_form_layout.xml
@@ -16,7 +16,7 @@
     <EditText
       android:id="@+id/free_form_text"
       style="@style/SurveyFreeFormAnswerEditText"
-      android:hint="@string/survey_free_form_text_hint"
+      android:hint="@string/survey_fragment_free_form_text"
       android:inputType="text|textMultiLine|textCapSentences"
       android:minLines="4"
       android:overScrollMode="never"
@@ -36,7 +36,7 @@
       android:clickable="@{viewModel.isAnswerAvailable()}"
       android:enabled="@{viewModel.isAnswerAvailable()}"
       android:onClick="@{(v) ->viewModel.handleSubmitButtonClicked()}"
-      android:text="@string/survey_submit_button"
+      android:text="@string/survey_fragment_submit_button"
       android:textColor="@{viewModel.isAnswerAvailable() ? @color/component_color_shared_secondary_4_text_color : @color/component_color_survey_disabled_button_text_color}"
       app:layout_constraintTop_toBottomOf="@id/free_form_text" />
   </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/survey_nps_score_layout.xml b/app/src/main/res/layout/survey_nps_score_layout.xml
index 8f84603de25..50dd070a21b 100644
--- a/app/src/main/res/layout/survey_nps_score_layout.xml
+++ b/app/src/main/res/layout/survey_nps_score_layout.xml
@@ -17,7 +17,7 @@
       android:id="@+id/not_likely_text_view"
       style="@style/SurveyNpsHintTextStyle"
       android:fontFamily="sans-serif-light"
-      android:text="@string/survey_nps_not_at_all_likely_label"
+      android:text="@string/survey_activity_nps_score_not_likely_text"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
 
@@ -32,7 +32,7 @@
     <TextView
       android:id="@+id/extremely_likely_text_view"
       style="@style/SurveyNpsHintTextStyle"
-      android:text="@string/survey_nps_extremely_likely_label"
+      android:text="@string/survey_activity_nps_score_extremely_likely_text"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintTop_toBottomOf="@id/survey_nps_buttons_container" />
   </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/survey_outro_dialog_fragment.xml b/app/src/main/res/layout/survey_outro_dialog_fragment.xml
index 0b1719efc04..990c3fd72d4 100644
--- a/app/src/main/res/layout/survey_outro_dialog_fragment.xml
+++ b/app/src/main/res/layout/survey_outro_dialog_fragment.xml
@@ -9,7 +9,7 @@
     <TextView
       android:id="@+id/survey_onboarding_title_text"
       style="@style/SurveyPopupHeaderStyle"
-      android:text="@string/survey_thank_you_title_text"
+      android:text="@string/survey_activity_outer_dialog_onboarding_title_text"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
@@ -46,7 +46,7 @@
       style="@style/SurveyPrimaryButton"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:text="@string/survey_exit_survey_button"
+      android:text="@string/survey_activity_outer_dialog_finish_button"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@id/survey_onboarding_text"
diff --git a/app/src/main/res/layout/survey_welcome_dialog_fragment.xml b/app/src/main/res/layout/survey_welcome_dialog_fragment.xml
index abbd11759a7..06924f21cf1 100644
--- a/app/src/main/res/layout/survey_welcome_dialog_fragment.xml
+++ b/app/src/main/res/layout/survey_welcome_dialog_fragment.xml
@@ -9,7 +9,7 @@
     <TextView
       android:id="@+id/survey_onboarding_title_text"
       style="@style/SurveyPopupHeaderStyle"
-      android:text="@string/survey_onboarding_title_text"
+      android:text="@string/survey_activity_welcome_dialog_onboarding_title_text"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
@@ -39,7 +39,7 @@
       style="@style/SurveyPopupMessageStyle"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
-      android:text="@string/survey_onboarding_message_text"
+      android:text="@string/survey_activity_exit_dialog_onboarding_text"
       app:layout_constraintTop_toTopOf="@id/survey_onboarding_center_guide" />
 
     <Button
@@ -47,7 +47,7 @@
       style="@style/SurveyPrimaryButton"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
-      android:text="@string/survey_begin_survey_button"
+      android:text="@string/survey_activity_welcome_dialog_begin_survey_button"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@id/survey_onboarding_text"
@@ -59,7 +59,7 @@
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/survey_navigation_buttons_margin"
-      android:text="@string/survey_maybe_later_button"
+      android:text="@string/survey_activity_welcome_dialog_maybe_later_button"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@id/begin_survey_button" />
diff --git a/app/src/main/res/layout/test_margin_bindable_adapter_activity.xml b/app/src/main/res/layout/test_margin_bindable_adapter_activity.xml
index c86ec3b2257..4ca58d5e35e 100644
--- a/app/src/main/res/layout/test_margin_bindable_adapter_activity.xml
+++ b/app/src/main/res/layout/test_margin_bindable_adapter_activity.xml
@@ -10,7 +10,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:fontFamily="sans-serif-medium"
-      android:text="@string/select_a_topic_to_start"
+      android:text="@string/home_activity_all_topics_text"
       android:padding="10dp"
       android:background="@color/component_color_test_margin_bindable_adapter_activity_background_color"
       android:textColor="@color/component_color_shared_primary_text_color"
diff --git a/app/src/main/res/layout/text_input_interaction_item.xml b/app/src/main/res/layout/text_input_interaction_item.xml
index e204f674cf6..5f6d5f50051 100644
--- a/app/src/main/res/layout/text_input_interaction_item.xml
+++ b/app/src/main/res/layout/text_input_interaction_item.xml
@@ -23,7 +23,7 @@
       android:id="@+id/text_input_interaction_view"
       style="@style/InputInteractionEditText"
       android:hint="@{viewModel.hintText}"
-      android:contentDescription="@{viewModel.hintText.length() == 0 ? @string/text_input_default_content_description : ``}"
+      android:contentDescription="@{viewModel.hintText.length() == 0 ? @string/state_fragment_text_input_interaction_content_description : ``}"
       android:inputType="text"
       android:text="@={viewModel.answerText}"
       android:textColorHint="@color/component_color_shared_edit_text_hint_color"
diff --git a/app/src/main/res/layout/top_left_overlay.xml b/app/src/main/res/layout/top_left_overlay.xml
index d005ea8287c..015344e7555 100644
--- a/app/src/main/res/layout/top_left_overlay.xml
+++ b/app/src/main/res/layout/top_left_overlay.xml
@@ -25,7 +25,7 @@
       app:layout_constraintTop_toTopOf="parent"
       app:srcCompat="@drawable/ic_rounded_arrow_up_right"
       app:tint="@color/component_color_shared_spotlight_overlay_arrow_color"
-      android:contentDescription="@string/spotlight_overlay_arrow_content_description" />
+      android:contentDescription="@string/spotlight_fragment_overlay_arrow_content_description" />
 
     <com.google.android.material.card.MaterialCardView
       android:layout_width="0dp"
@@ -69,7 +69,7 @@
           app:layout_constraintTop_toTopOf="parent"
           app:srcCompat="@drawable/ic_close_black_24"
           app:tint="@color/component_color_shared_close_spotlight_button_color"
-          android:contentDescription="@string/close_spotlight_button_content_description" />
+          android:contentDescription="@string/spotlight_fragment_close_button_content_description" />
       </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
   </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/top_right_overlay.xml b/app/src/main/res/layout/top_right_overlay.xml
index 9043b9bd3d8..24bc4405657 100644
--- a/app/src/main/res/layout/top_right_overlay.xml
+++ b/app/src/main/res/layout/top_right_overlay.xml
@@ -26,7 +26,7 @@
       app:layout_constraintTop_toTopOf="parent"
       app:srcCompat="@drawable/ic_rounded_arrow_up_right"
       app:tint="@color/component_color_shared_spotlight_overlay_arrow_color"
-      android:contentDescription="@string/spotlight_overlay_arrow_content_description" />
+      android:contentDescription="@string/spotlight_fragment_overlay_arrow_content_description" />
 
     <com.google.android.material.card.MaterialCardView
       android:layout_width="0dp"
@@ -72,7 +72,7 @@
           app:layout_constraintTop_toTopOf="parent"
           app:srcCompat="@drawable/ic_close_black_24"
           app:tint="@color/component_color_shared_close_spotlight_button_color"
-          android:contentDescription="@string/close_spotlight_button_content_description" />
+          android:contentDescription="@string/spotlight_fragment_close_button_content_description" />
       </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
   </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/topic_fragment.xml b/app/src/main/res/layout/topic_fragment.xml
index 3e743f27b1d..dc64f50d08c 100644
--- a/app/src/main/res/layout/topic_fragment.xml
+++ b/app/src/main/res/layout/topic_fragment.xml
@@ -32,7 +32,7 @@
         android:fontFamily="sans-serif"
         android:minHeight="?attr/actionBarSize"
         android:theme="@style/Widget.AppCompat.ActionBar"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator">
 
         <TextView
diff --git a/app/src/main/res/layout/topic_info_fragment.xml b/app/src/main/res/layout/topic_info_fragment.xml
index 47eccc08b25..3eed8f48448 100644
--- a/app/src/main/res/layout/topic_info_fragment.xml
+++ b/app/src/main/res/layout/topic_info_fragment.xml
@@ -105,7 +105,7 @@
         android:minHeight="48dp"
         android:onClick="@{(v) -> viewModel.clickSeeMore()}"
         android:paddingTop="8dp"
-        android:text="@{viewModel.isDescriptionExpanded() ? @string/see_less : @string/see_more}"
+        android:text="@{viewModel.isDescriptionExpanded() ? @string/topic_fragment_info_see_less_text : @string/topic_fragment_info_see_more_text}"
         android:textColor="@color/component_color_shared_active_text_color"
         android:textSize="16sp"
         android:textStyle="bold"
@@ -127,7 +127,7 @@
         app:layout_constraintTop_toBottomOf="@+id/see_more_text_view"
         app:srcCompat="@{viewModel.downloadStatusIndicatorDrawableResourceId, default=@drawable/ic_available_offline_primary_24dp}"
         app:tint="@color/component_color_topic_info_fragment_download_status_image_color"
-        android:contentDescription="@string/download_status_image_content_description" />
+        android:contentDescription="@string/topic_fragment_info_download_status_image_description" />
 
       <TextView
         android:id="@+id/download_story_count_text_view"
@@ -136,7 +136,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
         android:fontFamily="sans-serif"
-        android:text="@string/topic_downloaded"
+        android:text="@string/topic_fragment_info_topic_downloaded"
         android:textColor="@color/component_color_shared_download_story_text_color"
         android:textSize="18sp"
         app:layout_constraintBottom_toBottomOf="@+id/download_status_image_view"
diff --git a/app/src/main/res/layout/topic_lessons_story_summary.xml b/app/src/main/res/layout/topic_lessons_story_summary.xml
index c5c9db0f973..6b83f65891f 100644
--- a/app/src/main/res/layout/topic_lessons_story_summary.xml
+++ b/app/src/main/res/layout/topic_lessons_story_summary.xml
@@ -82,7 +82,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
             android:fontFamily="sans-serif"
-            android:text="@{viewModel.storyPercentage != 100? @string/status_in_progress : @string/status_completed}"
+            android:text="@{viewModel.storyPercentage != 100? @string/topic_fragment_lessons_story_status_in_progress : @string/topic_fragment_lessons_story_status_completed}"
             android:textColor="@color/component_color_shared_primary_text_color"
             android:textSize="10sp"
             android:visibility="@{viewModel.storyPercentage != 0 ? View.VISIBLE : View.GONE}" />
@@ -139,7 +139,7 @@
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_gravity="center_horizontal|bottom"
-              android:contentDescription="@{isListExpanded ? @string/hide_chapter_list : @string/show_chapter_list}"
+              android:contentDescription="@{isListExpanded ? @string/topic_fragment_lessons_hide_chapter_list : @string/topic_fragment_lessons_show_chapter_list}"
               app:isRotationAnimationClockwise="@{isListExpanded}"
               app:rotationAnimationAngle="@{180f}"
               app:srcCompat="@drawable/ic_arrow_drop_down_black_24dp"
diff --git a/app/src/main/res/layout/topic_lessons_title.xml b/app/src/main/res/layout/topic_lessons_title.xml
index 438402ead67..12fffd3e0c5 100644
--- a/app/src/main/res/layout/topic_lessons_title.xml
+++ b/app/src/main/res/layout/topic_lessons_title.xml
@@ -20,6 +20,6 @@
       android:layout_marginStart="@dimen/topic_lessons_title_margin_start"
       android:layout_marginTop="@dimen/topic_lessons_title_margin_top"
       android:layout_marginEnd="@dimen/topic_lessons_title_margin_end"
-      android:text="@string/stories_you_can_play" />
+      android:text="@string/home_activity_topic_play_text" />
   </FrameLayout>
 </layout>
diff --git a/app/src/main/res/layout/topic_practice_footer_view.xml b/app/src/main/res/layout/topic_practice_footer_view.xml
index e2f704048f3..a4bd77a9909 100644
--- a/app/src/main/res/layout/topic_practice_footer_view.xml
+++ b/app/src/main/res/layout/topic_practice_footer_view.xml
@@ -30,7 +30,7 @@
       android:enabled="@{isSubmitButtonActive}"
       android:fontFamily="sans-serif-medium"
       android:minHeight="@dimen/clickable_item_min_height"
-      android:text="@string/topic_practice_start"
+      android:text="@string/topic_fragment_practice_start_button"
       android:textColor="@{isSubmitButtonActive ? @color/component_color_shared_submit_text_active_color : @color/component_color_shared_submit_text_inactive_color}"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/topic_practice_header_view.xml b/app/src/main/res/layout/topic_practice_header_view.xml
index 7d187b30063..e2624bdf9a1 100644
--- a/app/src/main/res/layout/topic_practice_header_view.xml
+++ b/app/src/main/res/layout/topic_practice_header_view.xml
@@ -28,7 +28,7 @@
         android:id="@+id/master_skills_text_view"
         style="@style/Heading2ViewStart"
         android:layout_marginEnd="@dimen/master_skills_text_view_margin_end"
-        android:text="@string/topic_practice_master_these_skills"
+        android:text="@string/topic_fragment_practice_master_skills_text"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -36,7 +36,7 @@
         android:id="@+id/skills_description_text_view"
         style="@style/Subtitle1ViewStart"
         android:layout_marginTop="4dp"
-        android:text="@string/topic_practice_skills_description"
+        android:text="@string/topic_fragment_practice_skills_description"
         android:textColor="@color/component_color_topic_practice_header_view_description_text_color"
         app:layout_constraintStart_toStartOf="@+id/master_skills_text_view"
         app:layout_constraintTop_toBottomOf="@+id/master_skills_text_view" />
diff --git a/app/src/main/res/layout/topic_revision_fragment.xml b/app/src/main/res/layout/topic_revision_fragment.xml
index 2f2e852f774..8f4c065fcf4 100755
--- a/app/src/main/res/layout/topic_revision_fragment.xml
+++ b/app/src/main/res/layout/topic_revision_fragment.xml
@@ -21,6 +21,6 @@
     android:paddingEnd="@dimen/topic_revision_fragment_padding_end"
     android:paddingBottom="@dimen/topic_revision_fragment_padding_bottom"
     android:scrollbars="none"
-    android:tag="@string/topic_revision_recyclerview_tag"
+    android:tag="@string/topic_fragment_revision_recyclerview_tag"
     app:data="@{viewModel.subtopicLiveData}" />
 </layout>
diff --git a/app/src/main/res/layout/view_event_logs_fragment.xml b/app/src/main/res/layout/view_event_logs_fragment.xml
index 3d15a7a6b01..ef62640123a 100644
--- a/app/src/main/res/layout/view_event_logs_fragment.xml
+++ b/app/src/main/res/layout/view_event_logs_fragment.xml
@@ -31,7 +31,7 @@
         android:background="@color/component_color_shared_activity_toolbar_color"
         android:minHeight="?attr/actionBarSize"
         android:textSize="20sp"
-        app:navigationContentDescription="@string/navigate_up"
+        app:navigationContentDescription="@string/navigate_up_text"
         app:navigationIcon="?attr/homeAsUpIndicator"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         app:title="@string/developer_options_event_logs"
diff --git a/app/src/main/res/layout/walkthrough_activity.xml b/app/src/main/res/layout/walkthrough_activity.xml
index a9bf56e40ca..12f9ae91f64 100644
--- a/app/src/main/res/layout/walkthrough_activity.xml
+++ b/app/src/main/res/layout/walkthrough_activity.xml
@@ -33,7 +33,7 @@
       android:layout_width="48dp"
       android:layout_height="48dp"
       android:clickable="true"
-      android:contentDescription="@string/back_button"
+      android:contentDescription="@string/walkthrough_activity_back_button_text"
       android:focusable="true"
       android:onClick="@{(v) -> presenter.moveToPreviousPage(viewModel.currentProgress)}"
       android:padding="16dp"
diff --git a/app/src/main/res/layout/walkthrough_final_fragment.xml b/app/src/main/res/layout/walkthrough_final_fragment.xml
index a393fc72813..4747ef5701a 100644
--- a/app/src/main/res/layout/walkthrough_final_fragment.xml
+++ b/app/src/main/res/layout/walkthrough_final_fragment.xml
@@ -61,7 +61,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:fontFamily="sans-serif"
-            android:text="@string/no"
+            android:text="@string/walkthrough_activity_no_text"
             android:textColor="@color/component_color_shared_primary_text_color"
             android:textSize="20sp" />
 
@@ -72,7 +72,7 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="40dp"
             android:fontFamily="sans-serif"
-            android:text="@string/pick_a_different_topic"
+            android:text="@string/walkthrough_activity_pick_different_topic_text"
             android:textColor="@color/component_color_shared_primary_text_color"
             android:textSize="12sp" />
         </com.google.android.material.card.MaterialCardView>
@@ -94,7 +94,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:fontFamily="sans-serif"
-            android:text="@string/yes"
+            android:text="@string/walkthrough_activity_yes_text"
             android:textColor="@color/component_color_shared_secondary_6_text_color"
             android:textSize="20sp" />
 
@@ -105,7 +105,7 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="40dp"
             android:fontFamily="sans-serif"
-            android:text="@string/lets_get_started"
+            android:text="@string/walkthrough_activity_get_started_text"
             android:textColor="@color/component_color_shared_secondary_6_text_color"
             android:textSize="12sp" />
         </com.google.android.material.card.MaterialCardView>
@@ -134,7 +134,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="32dp"
         android:fontFamily="sans-serif"
-        android:text="@string/great"
+        android:text="@string/walkthrough_activity_final_title_text"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="24sp"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/walkthrough_topic_header_view.xml b/app/src/main/res/layout/walkthrough_topic_header_view.xml
index 91a413dbac4..c0b0a46c554 100644
--- a/app/src/main/res/layout/walkthrough_topic_header_view.xml
+++ b/app/src/main/res/layout/walkthrough_topic_header_view.xml
@@ -17,7 +17,7 @@
     android:layout_marginEnd="28dp"
     android:layout_marginBottom="16dp"
     android:fontFamily="sans-serif-medium"
-    android:text="@string/what_do_you_want_to_learn"
+    android:text="@string/walkthrough_activity_topic_header_text"
     android:textColor="@color/component_color_shared_primary_text_color"
     android:textSize="24sp" />
 </layout>
diff --git a/app/src/main/res/layout/walkthrough_welcome_fragment.xml b/app/src/main/res/layout/walkthrough_welcome_fragment.xml
index 9543ab9a2e1..aa09f27ea2d 100644
--- a/app/src/main/res/layout/walkthrough_welcome_fragment.xml
+++ b/app/src/main/res/layout/walkthrough_welcome_fragment.xml
@@ -46,7 +46,7 @@
         android:layout_marginTop="16dp"
         android:layout_marginEnd="32dp"
         android:fontFamily="sans-serif"
-        android:text="@string/walkthrough_welcome_description"
+        android:text="@string/walkthrough_activity_welcome_description"
         android:textColor="@color/component_color_shared_primary_text_color"
         android:textSize="20sp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -71,7 +71,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="32dp"
         android:onClick="@{(v) -> presenter.changePage()}"
-        android:text="@string/next"
+        android:text="@string/next_text"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/menu/navigation_drawer_menu.xml b/app/src/main/res/menu/navigation_drawer_menu.xml
index aa4dc482ee3..11f6fa55491 100644
--- a/app/src/main/res/menu/navigation_drawer_menu.xml
+++ b/app/src/main/res/menu/navigation_drawer_menu.xml
@@ -10,19 +10,19 @@
     <item
       android:id="@+id/nav_options"
       android:icon="@drawable/ic_options_icon_grey_24dp"
-      android:title="@string/menu_options" />
+      android:title="@string/menu_options_text" />
     <item
       android:id="@+id/nav_help"
       android:icon="@drawable/ic_help_grey_icon_24dp"
-      android:title="@string/menu_help" />
+      android:title="@string/menu_help_text" />
     <item
       android:id="@+id/nav_my_downloads"
       android:icon="@drawable/ic_folder_open_24dp"
-      android:title="@string/menu_my_downloads"
+      android:title="@string/navigation_drawer_fragment_menu_my_downloads_text"
       android:visible="false" />
     <item
       android:id="@+id/nav_switch_profile"
       android:icon="@drawable/ic_profile_exit"
-      android:title="@string/menu_switch_profile" />
+      android:title="@string/navigation_drawer_fragment_switch_profile" />
   </group>
 </menu>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 5cf88b6abee..d5b3a266c08 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -8,159 +8,145 @@
 * Seanlip
 -->
 <resources>
-  <string name="nav_header_desc">أعلى قائمة التنقل</string>
-  <string name="menu_options">خيارات</string>
-  <string name="menu_my_downloads">التنزيلات</string>
-  <string name="menu_help">مساعدة</string>
+  <string name="menu_options_text">خيارات</string>
+  <string name="navigation_drawer_fragment_menu_my_downloads_text">التنزيلات</string>
+  <string name="menu_help_text">مساعدة</string>
   <string name="exploration_activity_title">مشغل رحلة الاستكشاف</string>
   <string name="help_activity_title">المساعدة</string>
-  <string name="bottom_sheet_options_menu_close">أغلق</string>
-  <string name="menu_switch_profile">تغيير الملف الشخصي</string>
-  <string name="developer_options">خيارات المطورين</string>
-  <string name="administrator_controls">أدوات تحكم المشرف</string>
-  <string name="drawer_open_content_description">فتح قائمة التنقل</string>
-  <string name="drawer_close_content_description">غلق قائمة التنقل</string>
-  <string name="audio_play_description">تشغيل الصوت</string>
-  <string name="audio_pause_description">إيقاف الصوت مؤقتًا</string>
-  <string name="audio_unavailable_in_selected_language">صوت %s غير متوفر.</string>
-  <string name="audio_language_select_dialog_okay_button" fuzzy="true">موافق</string>
-  <string name="audio_language_select_dialog_cancel_button">إلغاء</string>
-  <string name="audio_language_select_dialog_title">لغة الصوت</string>
-  <string name="audio_dialog_offline_title">غير متصل بالإنترنت</string>
-  <string name="audio_dialog_offline_message">من فضلك تأكد من وجود اتصال بالإنترنت عن طريق شبكة الوايفاي أو بيانات الهاتف، ثم حاول مرة أخرى.</string>
-  <string name="audio_dialog_offline_positive" fuzzy="true">حسنًا</string>
-  <string name="cellular_data_alert_dialog_okay_button" fuzzy="true">موافق</string>
-  <string name="cellular_data_alert_dialog_cancel_button">إلغاء</string>
-  <string name="cellular_data_alert_dialog_title">متصل بالإنترنت عن طريق بيانات الهاتف</string>
-  <string name="cellular_data_alert_dialog_description">تشغيل الصوت عبر الإنترنت قد يستخدم الكثير من بيانات الهاتف.</string>
-  <string name="cellular_data_alert_dialog_checkbox">لا تُظهِر هذه الرسالة مُجددًا</string>
-  <string name="concept_card_toolbar_title">بطاقة المفهوم</string>
-  <string name="revision_card_toolbar_title">بطاقة المراجعة</string>
+  <string name="exploration_activity_options_menu_close_text">أغلق</string>
+  <string name="navigation_drawer_fragment_switch_profile">تغيير الملف الشخصي</string>
+  <string name="navigation_drawer_fragment_developer_options">خيارات المطورين</string>
+  <string name="administrator_controls_activity_title">أدوات تحكم المشرف</string>
+  <string name="navigation_drawer_fragment_open_content_description">فتح قائمة التنقل</string>
+  <string name="navigation_drawer_fragment_close_content_description">غلق قائمة التنقل</string>
+  <string name="audio_fragment_play_description">تشغيل الصوت</string>
+  <string name="audio_fragment_pause_description">إيقاف الصوت مؤقتًا</string>
+  <string name="audio_fragment_audio_unavailable_text">صوت %s غير متوفر.</string>
+  <string name="audio_language_dialog_okay_button_text" fuzzy="true">موافق</string>
+  <string name="audio_language_dialog_cancel_button_text">إلغاء</string>
+  <string name="audio_language_dialog_title">لغة الصوت</string>
+  <string name="audio_fragment_offline_dialog_title">غير متصل بالإنترنت</string>
+  <string name="audio_fragment_offline_dialog_message">من فضلك تأكد من وجود اتصال بالإنترنت عن طريق شبكة الوايفاي أو بيانات الهاتف، ثم حاول مرة أخرى.</string>
+  <string name="audio_fragment_offline_dialog_positive_button_text" fuzzy="true">حسنًا</string>
+  <string name="cellular_audio_dialog_okay_button_text" fuzzy="true">موافق</string>
+  <string name="cellular_audio_dialog_cancel_button_text">إلغاء</string>
+  <string name="cellular_audio_dialog_title">متصل بالإنترنت عن طريق بيانات الهاتف</string>
+  <string name="cellular_audio_dialog_description">تشغيل الصوت عبر الإنترنت قد يستخدم الكثير من بيانات الهاتف.</string>
+  <string name="cellular_audio_dialog_checkboxes_text">لا تُظهِر هذه الرسالة مُجددًا</string>
+  <string name="concept_card_fragment_title">بطاقة المفهوم</string>
   <string name="unsaved_exploration_dialog_title">هل تريد المغادرة إلى صفحة الموضوع؟</string>
   <string name="unsaved_exploration_dialog_description">لن يتم حفظ تقدمك.</string>
-  <string name="unsaved_exploration_dialog_leave_button">مغادرة</string>
-  <string name="unsaved_exploration_dialog_cancel_button">إلغاء</string>
+  <string name="unsaved_exploration_dialog_leave_button_text">مغادرة</string>
+  <string name="unsaved_exploration_dialog_cancel_button_text">إلغاء</string>
   <string name="stop_exploration_dialog_title">هل تريد المغادرة إلى صفحة الموضوع؟</string>
   <string name="stop_exploration_dialog_description">لن يتم حفظ تقدمك.</string>
-  <string name="stop_exploration_dialog_cancel_button">إلغاء</string>
-  <string name="stop_exploration_dialog_leave_button">مغادرة</string>
-  <string name="exploration_exit_button_spotlight_hint">اخرج في أي وقت باستخدام هذا الزر. سنحفظ تقدمك.</string>
-  <string name="voiceover_icon_spotlight_hint">هل ترغب في أن يقرأ %s لك؟ اضغط على هذا الزر لتجربته!</string>
-  <string name="voiceover_language_icon_spotlight_hint">انقر لتغيير لغة التعليق الصوتي.</string>
-  <string name="progress_database_full_dialog_title">تم الوصول إلى الحد الأقصى من سعة التخزين</string>
-  <string name="progress_database_full_dialog_description">سوف يتم حذف تقدمك في درس %s</string>
-  <string name="progress_database_full_dialog_continue_button">استمرار</string>
-  <string name="progress_database_full_dialog_leave_without_saving_progress_button">المغادرة بدون حفظ التقدم</string>
-  <string name="progress_database_full_dialog_back_to_lesson_button">العودة إلى الدرس</string>
-  <string name="topic_practice_master_these_skills">أتقن هذه المهارات</string>
-  <string name="topic_name_text_view">النسب والاستدلال النسبي</string>
-  <string name="topic_practice_skills_description">قم باختيار المهارات التي تريد أن تتدرب عليها.</string>
-  <string name="topic_practice_start">ابدأ</string>
-  <string name="info_tab_content_description">تفاصيل حول الموضوع.</string>
-  <string name="revision_tab_content_description">راجع المفاهيم المدروسة من الدروس المكتملة هنا.</string>
-  <string name="practice_tab_content_description">تدرب على المفاهيم المكتسبة من الدروس المكتملة.</string>
-  <string name="lessons_tab_content_description">انقر هنا لبدء تشغيل درس.</string>
-  <string name="topic_lessons_tab_spotlight_hint">ابحث عن كل دروسك هنا.</string>
-  <string name="topic_revision_tab_spotlight_hint">راجع المفاهيم المكتسبة من الدروس المكتملة هنا.</string>
-  <string name="first_chapter_spotlight_hint">انقر هنا لبدء تشغيل درس.</string>
-  <string name="state_continue_button">استمرار</string>
-  <string name="state_continue_submit">تقديم</string>
-  <string name="previous_state_description">التوجه إلى البطاقة السابقة</string>
-  <string name="next_state_description">التوجه إلى البطاقة القادمة</string>
-  <string name="state_submit_button">تقديم</string>
-  <string name="lesson_replay_button_text">إعادة التشغيل</string>
-  <string name="state_end_exploration_button">العودة إلى الموضوع</string>
-  <string name="previous_responses_header">الردود السابقة (%s)</string>
-  <string name="image_interaction_answer_text">يضغط على %s</string>
-  <string name="state_learn_again_button">تعلم مرة أخرى</string>
-  <string name="see_more">اعرض المزيد</string>
-  <string name="see_less">اعرض أقل</string>
-  <string name="FAQs">الأسئلة المتكررة</string>
-  <string name="featured_questions">الأسئلة المميزة</string>
-  <string name="frequently_asked_questions">الأسئلة المتكررة</string>
+  <string name="stop_exploration_dialog_cancel_button_text">إلغاء</string>
+  <string name="stop_exploration_dialog_leave_button_text">مغادرة</string>
+  <string name="exploration_activity_exit_button_spotlight_hint">اخرج في أي وقت باستخدام هذا الزر. سنحفظ تقدمك.</string>
+  <string name="exploration_activity_voiceover_icon_spotlight_hint">هل ترغب في أن يقرأ %s لك؟ اضغط على هذا الزر لتجربته!</string>
+  <string name="audio_fragment_voiceover_language_icon_spotlight_hint">انقر لتغيير لغة التعليق الصوتي.</string>
+  <string name="stop_exploration_dialog_progress_full_title">تم الوصول إلى الحد الأقصى من سعة التخزين</string>
+  <string name="stop_exploration_dialog_progress_full_description">سوف يتم حذف تقدمك في درس %s</string>
+  <string name="stop_exploration_dialog_progress_full_continue_button">استمرار</string>
+  <string name="stop_exploration_dialog_progress_full_without_saving_button">المغادرة بدون حفظ التقدم</string>
+  <string name="stop_exploration_dialog_progress_full_back_to_lesson_button">العودة إلى الدرس</string>
+  <string name="topic_fragment_practice_master_skills_text">أتقن هذه المهارات</string>
+  <string name="topic_fragment_practice_skills_description">قم باختيار المهارات التي تريد أن تتدرب عليها.</string>
+  <string name="topic_fragment_practice_start_button">ابدأ</string>
+  <string name="topic_fragment_info_tab_content_description">تفاصيل حول الموضوع.</string>
+  <string name="topic_fragment_revision_tab_content_description">راجع المفاهيم المدروسة من الدروس المكتملة هنا.</string>
+  <string name="topic_fragment_practice_tab_content_description">تدرب على المفاهيم المكتسبة من الدروس المكتملة.</string>
+  <string name="topic_fragment_lessons_tab_content_description">انقر هنا لبدء تشغيل درس.</string>
+  <string name="topic_fragment_lessons_tab_spotlight_hint">ابحث عن كل دروسك هنا.</string>
+  <string name="topic_fragment_revision_tab_spotlight_hint">راجع المفاهيم المكتسبة من الدروس المكتملة هنا.</string>
+  <string name="topic_fragment_first_chapter_spotlight_hint">انقر هنا لبدء تشغيل درس.</string>
+  <string name="state_fragment_continue_button_text">استمرار</string>
+  <string name="state_fragment_previous_state_button_description">التوجه إلى البطاقة السابقة</string>
+  <string name="state_fragment_next_state_button_description">التوجه إلى البطاقة القادمة</string>
+  <string name="state_fragment_submit_button_text">تقديم</string>
+  <string name="state_fragment_replay_button_text">إعادة التشغيل</string>
+  <string name="state_fragment_return_to_topic_button_text">العودة إلى الموضوع</string>
+  <string name="state_fragment_previous_responses_header">الردود السابقة (%s)</string>
+  <string name="state_fragment_image_interaction_answer_text">يضغط على %s</string>
+  <string name="topic_fragment_info_see_more_text">اعرض المزيد</string>
+  <string name="topic_fragment_info_see_less_text">اعرض أقل</string>
+  <string name="faq_list_activity_title">الأسئلة المتكررة</string>
+  <string name="faq_list_activity_item_header_text">الأسئلة المميزة</string>
   <string name="faq_activity_title">الأسئلة المتكررة</string>
   <string name="pin_password_activity_title">التحقق من رقم التعريف الشخصي</string>
   <string name="onboarding_activity_title">مقدمة</string>
-  <string name="frequently_asked_questions_FAQ">الأسئلة الأكثر تكرارا</string>
-  <string name="info">معلومات</string>
-  <string name="lessons">الدروس</string>
-  <string name="practice">ممارسة</string>
-  <string name="revision">مراجعة</string>
-  <string name="administrator_controls_title">أدوات تحكم المشرف</string>
-  <string name="topic_page">صفحة الموضوع</string>
-  <string name="topic_name">الموضوع: %s</string>
-  <string name="topic">موضوع</string>
+  <string name="help_activity_faq_text">الأسئلة الأكثر تكرارا</string>
+  <string name="topic_fragment_info">معلومات</string>
+  <string name="topic_fragment_lessons">الدروس</string>
+  <string name="topic_fragment_practice">ممارسة</string>
+  <string name="topic_fragment_revision">مراجعة</string>
+  <string name="topic_activity_title">صفحة الموضوع</string>
+  <string name="topic_fragment_name_text">الموضوع: %s</string>
   <string name="ongoing_topic_list_activity_title">المواضيع قيد التقدم</string>
-  <string name="chapter_name">فصل %s: %s</string>
-  <string name="chapter_completed">تم انهاء الفصل %s الذي يحمل عنوان %s</string>
-  <string name="chapter_in_progress">الفصل %s الذي يحمل عنوان %s ما زال قيد التقدم</string>
-  <string name="chapter_prerequisite_title_label">قم بإنهاء الفصل %s: %s لكي تفتح هذا الفصل.</string>
-  <string name="chapter_prerequisite_title_label_without_chapter_title">أكمل الفصل السابق لفتح هذا الفصل.</string>
-  <string name="text_input_default_content_description">أدخل النص.</string>
-  <string name="fractions_default_hint_text">أدخل كسر عشري في الصيغة (بسط/مقام)، أو عدد كسري في الصيغة (عدد بسط/مقام).</string>
-  <string name="fractions_default_hint_text_no_integer">أدخل كسر عشري في الصيغة بسط/مقام.</string>
-  <string name="numeric_input_hint">أدخل رقم.</string>
-  <string name="number_with_units_input_hint_text">أدخل أرقام بالوحدات هنا.</string>
-  <string name="numeric_expression_default_hint_text">اكتب تعبيرا هنا ، باستخدام الأرقام فقط.</string>
-  <string name="algebraic_expression_default_hint_text">اكتب تعبيرا هنا.</string>
-  <string name="math_equation_default_hint_text">اكتب معادلة هنا.</string>
-  <string name="math_expression_error_spaces_in_numerical_input">يرجى إزالة المسافات بين الأرقام في إجابتك.</string>
-  <string name="math_expression_error_unbalanced_parentheses">الرجاء إغلاق أو إزالة الأقواس.</string>
-  <string name="math_expression_error_single_redundant_parentheses">الرجاء إزالة الأقواس حول الإجابة بالكامل: \' %s \'.</string>
-  <string name="math_expression_error_multiple_redundant_parentheses">الرجاء إزالة الأقواس الزائدة حول \"( %1$s )\" ، على سبيل المثال: \" %1$s \".</string>
-  <string name="math_expression_error_redundant_parentheses_individual_term">الرجاء إزالة الأقواس الزائدة حول \'( %1$s )\' ، على سبيل المثال: \' %1$s \'.</string>
-  <string name="math_expression_error_unnecessary_symbols">يوجد \' %s \' غير صالح في الإجابة. يرجى إزالته.</string>
-  <string name="math_expression_error_number_after_var_term">الرجاء إعادة ترتيب ترتيب %1$s و %2$s . على سبيل المثال: %2$s% 1 $ s.</string>
-  <string name="math_expression_error_consecutive_binary_operators">يجب فصل %1$s و %2$s برقم أو متغير.</string>
-  <string name="math_expression_error_consecutive_unary_operators">الرجاء إزالة الرموز الإضافية في إجابتك.</string>
-  <string name="math_expression_error_missing_lhs_for_addition_operator">هل هناك رقم أو متغير مفقود قبل أو بعد رمز الإضافة \' %1$s \'؟ إذا لم يكن كذلك ، يرجى إزالة \' %1$s \' الإضافي.</string>
-  <string name="math_expression_error_missing_lhs_for_multiplication_operator">هل هناك رقم أو متغير مفقود قبل أو بعد رمز الضرب \' %1$s \'؟ إذا لم يكن كذلك ، يرجى إزالة \' %1$s \' الإضافي.</string>
-  <string name="math_expression_error_missing_lhs_for_division_operator">هل هناك رقم أو متغير مفقود قبل أو بعد رمز القسمة \' %1$s \'؟ إذا لم يكن كذلك ، يرجى إزالة \' %1$s \' الإضافي.</string>
-  <string name="math_expression_error_missing_lhs_for_exponentiation_operator">هل هناك رقم أو متغير مفقود قبل رمز الأسي \" %1$s \" أو بعده؟ إذا لم يكن كذلك ، يرجى إزالة \' %1$s \' الإضافي.</string>
-  <string name="math_expression_error_missing_rhs_for_addition_operator">يبدو أن هناك رقمًا أو متغيرًا مفقودًا بعد رمز الإضافة \' %s \'.</string>
-  <string name="math_expression_error_missing_rhs_for_subtraction_operator">يبدو أن هناك رقمًا أو متغيرًا مفقودًا بعد رمز الطرح \' %s \'.</string>
-  <string name="math_expression_error_missing_rhs_for_multiplication_operator">يبدو أن هناك رقمًا أو متغيرًا مفقودًا بعد رمز الضرب \' %s \'.</string>
-  <string name="math_expression_error_missing_rhs_for_division_operator">يبدو أن هناك رقمًا أو متغيرًا مفقودًا بعد رمز القسمة \' %s \'.</string>
-  <string name="math_expression_error_missing_rhs_for_exponentiation_operator">يبدو أن هناك رقمًا أو متغيرًا مفقودًا بعد رمز الأس \' %s \'.</string>
-  <string name="math_expression_error_exponent_has_variable">عذرًا ، المتغيرات في الأس لا يدعمها التطبيق. يرجى مراجعة إجابتك.</string>
-  <string name="math_expression_error_exponent_too_large">عذرًا ، لا يدعم التطبيق القوى الأعلى من 5. يرجى مراجعة إجابتك.</string>
-  <string name="math_expression_error_nested_exponent">عذرًا ، لا يدعم التطبيق الصلاحيات / الأسس المتكررة. الرجاء قصر إجابتك على قوة واحدة.</string>
-  <string name="math_expression_error_hanging_square_root">إدخال مفقود للجذر التربيعي.</string>
-  <string name="math_expression_error_term_divided_by_zero">القسمة على الصفر غير صالحة. يرجى مراجعة إجابتك.</string>
-  <string name="math_expression_error_variable_in_numeric_expression">يبدو أنك أدخلت بعض المتغيرات. يرجى التأكد من أن إجابتك تحتوي على أرقام فقط وإزالة أي متغيرات من إجابتك.</string>
-  <string name="math_expression_error_invalid_variable">الرجاء استخدام المتغيرات المحددة في السؤال وليس %s .</string>
-  <string name="math_expression_error_missing_equals">تفتقد معادلتك علامة \'=\'.</string>
-  <string name="math_expression_error_more_than_one_equals">تحتوي معادلتك على عدد كبير جدًا من علامات \'=\'. يجب أن يكون لها واحد فقط.</string>
-  <string name="math_expression_error_hanging_equals">أحد جوانب \"=\" في معادلتك فارغ.</string>
-  <string name="math_expression_error_unsupported_function">الوظيفة \' %s \' غير مدعومة. يرجى مراجعة إجابتك.</string>
-  <string name="math_expression_error_incomplete_function_name">هل تقصد sqrt؟ إذا لم يكن كذلك ، يرجى فصل المتغيرات برموز الضرب.</string>
-  <string name="math_expression_error_generic">عذرا ، لم نستطع فهم إجابتك. يرجى التحقق منه للتأكد من عدم وجود أية أخطاء.</string>
-  <string name="enable_audio_playback_content_description">تفعيل التعليق الصوتي لهذا الدرس.</string>
-  <string name="recently_played_stories">القصص التي تم تشغيلها مؤخرًا</string>
-  <string name="last_played_stories">آخر القصص التي تم تشغيلها</string>
-  <string name="view_all">عرض الكل</string>
-  <string name="ongoing_story_last_week">تم تشغيلها خلال الأسبوع الماضي</string>
-  <string name="ongoing_story_last_month">تم تشغيلها خلال الشهر الماضي</string>
+  <string name="topic_fragment_lessons_chapter_play_name_text">فصل %s: %s</string>
+  <string name="topic_fragment_lessons_chapter_completed_text">تم انهاء الفصل %s الذي يحمل عنوان %s</string>
+  <string name="topic_fragment_lessons_chapter_in_progress_text">الفصل %s الذي يحمل عنوان %s ما زال قيد التقدم</string>
+  <string name="topic_fragment_lessons_chapter_prerequisite_label">قم بإنهاء الفصل %s: %s لكي تفتح هذا الفصل.</string>
+  <string name="topic_fragment_lessons_without_chapter_prerequisite_label">أكمل الفصل السابق لفتح هذا الفصل.</string>
+  <string name="state_fragment_text_input_interaction_content_description">أدخل النص.</string>
+  <string name="state_fragment_fraction_input_interaction_hint">أدخل كسر عشري في الصيغة (بسط/مقام)، أو عدد كسري في الصيغة (عدد بسط/مقام).</string>
+  <string name="state_fragment_fraction_input_interaction_no_integer_hint">أدخل كسر عشري في الصيغة بسط/مقام.</string>
+  <string name="state_fragment_numeric_input_interaction_hint">أدخل رقم.</string>
+  <string name="state_fragment_numeric_input_interaction_default_hint">اكتب تعبيرا هنا ، باستخدام الأرقام فقط.</string>
+  <string name="state_fragment_algebraic_input_interaction_default_hint">اكتب تعبيرا هنا.</string>
+  <string name="state_fragment_math_equation_default_hint">اكتب معادلة هنا.</string>
+  <string name="state_fragment_math_expression_space_error">يرجى إزالة المسافات بين الأرقام في إجابتك.</string>
+  <string name="state_fragment_math_expression_unbalanced_parentheses_error">الرجاء إغلاق أو إزالة الأقواس.</string>
+  <string name="state_fragment_math_expression_single_redundant_parentheses_error">الرجاء إزالة الأقواس حول الإجابة بالكامل: \' %s \'.</string>
+  <string name="state_fragment_math_expression_multiple_redundant_parentheses_error">الرجاء إزالة الأقواس الزائدة حول \"( %1$s )\" ، على سبيل المثال: \" %1$s \".</string>
+  <string name="state_fragment_math_expression_individual_redundant_parentheses_error">الرجاء إزالة الأقواس الزائدة حول \'( %1$s )\' ، على سبيل المثال: \' %1$s \'.</string>
+  <string name="state_fragment_math_expression_unnecessary_symbols_error">يوجد \' %s \' غير صالح في الإجابة. يرجى إزالته.</string>
+  <string name="state_fragment_math_expression_number_after_var_error">الرجاء إعادة ترتيب ترتيب %1$s و %2$s . على سبيل المثال: %2$s% 1 $ s.</string>
+  <string name="state_fragment_math_expression_consecutive_binary_operators_error">يجب فصل %1$s و %2$s برقم أو متغير.</string>
+  <string name="state_fragment_math_expression_consecutive_unary_operators_error">الرجاء إزالة الرموز الإضافية في إجابتك.</string>
+  <string name="state_fragment_math_expression_missing_lhs_for_addition_error">هل هناك رقم أو متغير مفقود قبل أو بعد رمز الإضافة \' %1$s \'؟ إذا لم يكن كذلك ، يرجى إزالة \' %1$s \' الإضافي.</string>
+  <string name="state_fragment_math_expression_missing_lhs_for_multiplication_error">هل هناك رقم أو متغير مفقود قبل أو بعد رمز الضرب \' %1$s \'؟ إذا لم يكن كذلك ، يرجى إزالة \' %1$s \' الإضافي.</string>
+  <string name="state_fragment_math_expression_missing_lhs_for_division_error">هل هناك رقم أو متغير مفقود قبل أو بعد رمز القسمة \' %1$s \'؟ إذا لم يكن كذلك ، يرجى إزالة \' %1$s \' الإضافي.</string>
+  <string name="state_fragment_math_expression_missing_lhs_for_exponentiation_error">هل هناك رقم أو متغير مفقود قبل رمز الأسي \" %1$s \" أو بعده؟ إذا لم يكن كذلك ، يرجى إزالة \' %1$s \' الإضافي.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_addition_error">يبدو أن هناك رقمًا أو متغيرًا مفقودًا بعد رمز الإضافة \' %s \'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_subtraction_error">يبدو أن هناك رقمًا أو متغيرًا مفقودًا بعد رمز الطرح \' %s \'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_multiplication_error">يبدو أن هناك رقمًا أو متغيرًا مفقودًا بعد رمز الضرب \' %s \'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_division_error">يبدو أن هناك رقمًا أو متغيرًا مفقودًا بعد رمز القسمة \' %s \'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_exponentiation_error">يبدو أن هناك رقمًا أو متغيرًا مفقودًا بعد رمز الأس \' %s \'.</string>
+  <string name="state_fragment_math_expression_exponent_has_variable_error">عذرًا ، المتغيرات في الأس لا يدعمها التطبيق. يرجى مراجعة إجابتك.</string>
+  <string name="state_fragment_math_expression_exponent_too_large_error">عذرًا ، لا يدعم التطبيق القوى الأعلى من 5. يرجى مراجعة إجابتك.</string>
+  <string name="state_fragment_math_expression_nested_exponent_error">عذرًا ، لا يدعم التطبيق الصلاحيات / الأسس المتكررة. الرجاء قصر إجابتك على قوة واحدة.</string>
+  <string name="state_fragment_math_expression_hanging_square_root_error">إدخال مفقود للجذر التربيعي.</string>
+  <string name="state_fragment_math_expression_divided_by_zero_error">القسمة على الصفر غير صالحة. يرجى مراجعة إجابتك.</string>
+  <string name="state_fragment_math_expression_variable_in_numeric_error">يبدو أنك أدخلت بعض المتغيرات. يرجى التأكد من أن إجابتك تحتوي على أرقام فقط وإزالة أي متغيرات من إجابتك.</string>
+  <string name="state_fragment_math_expression_invalid_variable_error">الرجاء استخدام المتغيرات المحددة في السؤال وليس %s .</string>
+  <string name="state_fragment_math_expression_missing_equals_error">تفتقد معادلتك علامة \'=\'.</string>
+  <string name="state_fragment_math_expression_more_than_one_equals_error">تحتوي معادلتك على عدد كبير جدًا من علامات \'=\'. يجب أن يكون لها واحد فقط.</string>
+  <string name="state_fragment_math_expression_hanging_equals_error">أحد جوانب \"=\" في معادلتك فارغ.</string>
+  <string name="state_fragment_math_expression_unsupported_function_error">الوظيفة \' %s \' غير مدعومة. يرجى مراجعة إجابتك.</string>
+  <string name="state_fragment_math_expression_incomplete_function_name_error">هل تقصد sqrt؟ إذا لم يكن كذلك ، يرجى فصل المتغيرات برموز الضرب.</string>
+  <string name="state_fragment_math_expression_generic_error">عذرا ، لم نستطع فهم إجابتك. يرجى التحقق منه للتأكد من عدم وجود أية أخطاء.</string>
+  <string name="home_activity_recently_played_stories">القصص التي تم تشغيلها مؤخرًا</string>
+  <string name="home_activity_last_played_stories">آخر القصص التي تم تشغيلها</string>
+  <string name="home_activity_view_all_text">عرض الكل</string>
+  <string name="home_activity_ongoing_story_last_week">تم تشغيلها خلال الأسبوع الماضي</string>
+  <string name="home_activity_ongoing_story_last_month">تم تشغيلها خلال الشهر الماضي</string>
   <string name="story_activity_title">قائمة الفصول</string>
-  <string name="lesson_thumbnail_content_description">صورة %s</string>
-  <string name="stories_you_can_play">القصص التي باستطاعتك تشغيلها</string>
-  <string name="navigate_up">العودة للسابق</string>
-  <string name="recently_played_activity">القصص التي تم تشغيلها مؤخرًا</string>
-  <string name="topic_downloaded">المواضيع التي تم تنزيلها</string>
-  <string name="downloaded">تم التنزيل</string>
-  <string name="question_player_title">وضع الممارسة</string>
-  <string name="question_training_session_progress">السؤال %s من أصل %s</string>
-  <string name="question_training_session_progress_finished">تمّ</string>
-  <string name="question_training_session_finished_header">تم الإنتهاء</string>
-  <string name="question_training_session_finished_message">تم الإنتهاء من جميع الأسئلة! يمكنك بدأ مجموعة أسئلة أخرى، أو العودة للموضوع.</string>
-  <string name="status_in_progress">في تقدم</string>
-  <string name="status_completed">مكتمل</string>
-  <string name="show_chapter_list">عرض قائمة الفصول</string>
-  <string name="hide_chapter_list">إخفاء قائمة الفصول</string>
-  <string name="play_pause_audio">تشغيل/إيقاف مؤقت للصوت</string>
-  <string name="preferences">التفضيلات</string>
+  <string name="home_activity_lesson_thumbnail_description">صورة %s</string>
+  <string name="home_activity_topic_play_text">القصص التي باستطاعتك تشغيلها</string>
+  <string name="navigate_up_text">العودة للسابق</string>
+  <string name="recently_played_activity_title">القصص التي تم تشغيلها مؤخرًا</string>
+  <string name="topic_fragment_info_topic_downloaded">المواضيع التي تم تنزيلها</string>
+  <string name="exploration_activity_question_player_title">وضع الممارسة</string>
+  <string name="topic_fragment_question_training_session_progress">السؤال %s من أصل %s</string>
+  <string name="topic_fragment_question_training_session_progress_finished">تمّ</string>
+  <string name="topic_fragment_question_end_session_header_text">تم الإنتهاء</string>
+  <string name="topic_fragment_question_end_session_body_text">تم الإنتهاء من جميع الأسئلة! يمكنك بدأ مجموعة أسئلة أخرى، أو العودة للموضوع.</string>
+  <string name="topic_fragment_lessons_story_status_in_progress">في تقدم</string>
+  <string name="topic_fragment_lessons_story_status_completed">مكتمل</string>
+  <string name="topic_fragment_lessons_show_chapter_list">عرض قائمة الفصول</string>
+  <string name="topic_fragment_lessons_hide_chapter_list">إخفاء قائمة الفصول</string>
   <string name="profile_progress_activity_title">صفحة تقدم الملف الشخصي</string>
-  <string name="search">بحث</string>
   <string name="fraction_error_invalid_chars">من فضلك قم باستخدام أرقام، أو مسافات، أو الرمز (/)</string>
   <string name="fraction_error_invalid_format">من فضلك أدخل كسر عشري صالح (5/3 أو 1 2/3 على سبيل المثال)</string>
   <string name="fraction_error_divide_by_zero">من فضلك لا تضع 0 في المقام</string>
@@ -179,7 +165,6 @@
   <string name="size_mb">%s م.ب</string>
   <string name="size_gb">%s ج.ب</string>
   <string name="correct">صحيح!</string>
-  <string name="topic_prefix">الموضوع: %s</string>
   <plurals name="chapter_count" fuzzy="true">
     <item quantity="zero">و لا فصل</item>
     <item quantity="one">فصلًا واحدًا</item>
@@ -228,276 +213,263 @@
     <item quantity="many">%s موضوع في تقدم</item>
     <item quantity="other">%s موضوع في تقدم</item>
   </plurals>
-  <string name="profile_chooser_activity_label">صفحة اختيار الملف الشخصي</string>
-  <string name="profile_chooser_admin">المشرف</string>
-  <string name="profile_chooser_select">اختر الملف الشخصي</string>
-  <string name="profile_chooser_add">إضافة ملف شخصي</string>
-  <string name="set_up_multiple_profiles">إعداد العديد من الملفات الشخصية</string>
-  <string name="set_up_multiple_profiles_description">أضف حتى 10 مستخدمين إلى حسابك. مثالي للعائلات والفصول الدراسية.</string>
-  <string name="profile_chooser_administrator_controls">أدوات تحكم المشرف</string>
-  <string name="profile_chooser_language">اللغة</string>
-  <string name="admin_auth_toolbar">أدوات تحكم المشرف</string>
+  <string name="profile_chooser_activity_title">صفحة اختيار الملف الشخصي</string>
+  <string name="profile_chooser_fragment_admin_text">المشرف</string>
+  <string name="profile_chooser_fragment_select_text">اختر الملف الشخصي</string>
+  <string name="profile_chooser_fragment_add_text">إضافة ملف شخصي</string>
+  <string name="profile_chooser_fragment_set_up_multiple_profiles">إعداد العديد من الملفات الشخصية</string>
+  <string name="profile_chooser_fragment_add_profile_description_text">أضف حتى 10 مستخدمين إلى حسابك. مثالي للعائلات والفصول الدراسية.</string>
+  <string name="profile_chooser_fragment_administrator_controls_text">أدوات تحكم المشرف</string>
+  <string name="profile_chooser_fragment_language_text">اللغة</string>
+  <string name="admin_auth_activity_title">أدوات تحكم المشرف</string>
   <string name="admin_auth_activity_add_profiles_title">أمّن الحساب لإضافة ملفات شخصية</string>
   <string name="admin_auth_activity_access_controls_title">أمّن الحساب للوصول إلى أدوات تحكم المشرف</string>
-  <string name="admin_auth_heading">إذن المشرف مطلوب</string>
-  <string name="admin_auth_sub">أدخل رقم التعريف الشخصي الخاص بالمشرف لكي تُنشئ حسابًا جديدًا.</string>
-  <string name="admin_auth_admin_controls_sub">أدخل رقم التعريف الشخصي الخاص بالمشرف لكي تصل إلى أدوات تحكم المشرف.</string>
-  <string name="admin_auth_pin">رقم التعريف الشخصي الخاص بالمشرف</string>
-  <string name="admin_auth_incorrect">رقم التعريف الشخصي الخاص بالمشرف غير صحيح. من فضلك حاول مجددًا.</string>
-  <string name="admin_auth_null">من فضلك أدخل رقم التعريف الشخصي الخاص بالمشرف.</string>
-  <string name="admin_auth_submit">تقديم</string>
-  <string name="admin_auth_close">إغلاق</string>
-  <string name="admin_pin_requirement_description">قبل أن نضيف ملفات شخصية، نريد أن نحمي حسابك الشخصي عن طريق إنشاء رقم تعريف شخصي. هذا يمكنك من السماح بالتنزيلات وإدارة الملفات الشخصية على الجهاز.</string>
-  <string name="admin_pin_pin_description">لا تستخدم رقم تعريف شخصي استخدمته من قبل لحسابات الشخصية مثل حساب البنك أو حساب الضمان الإجتماعي.</string>
-  <string name="admin_pin_new_pin">رقم تعريف شخصي جديد مكون من 5 أرقام</string>
-  <string name="admin_pin_new_confirm">تأكيد رقم التعريف الشخصي المكون من 5 أرقام</string>
-  <string name="admin_pin_error_pin_length">رقم التعريف الشخصي يجب أن يتكون من 5 أرقام.</string>
-  <string name="admin_pin_error_pin_confirm_wrong">برجاء التأكد من تطابق رقمي التعريف الشخصي.</string>
-  <string name="save">حفظ</string>
+  <string name="admin_auth_activity_heading_text">إذن المشرف مطلوب</string>
+  <string name="admin_auth_activity_subheading_text">أدخل رقم التعريف الشخصي الخاص بالمشرف لكي تُنشئ حسابًا جديدًا.</string>
+  <string name="admin_auth_activity_controls_subheading_text">أدخل رقم التعريف الشخصي الخاص بالمشرف لكي تصل إلى أدوات تحكم المشرف.</string>
+  <string name="admin_auth_activity_input_pin_hint_text">رقم التعريف الشخصي الخاص بالمشرف</string>
+  <string name="admin_auth_activity_incorrect_pin_label">رقم التعريف الشخصي الخاص بالمشرف غير صحيح. من فضلك حاول مجددًا.</string>
+  <string name="admin_auth_activity_null_pin_input_label">من فضلك أدخل رقم التعريف الشخصي الخاص بالمشرف.</string>
+  <string name="admin_auth_activity_submit_button_text">تقديم</string>
+  <string name="admin_auth_activity_tool_bar_content_desc">إغلاق</string>
+  <string name="admin_pin_activity_requirement_description_text">قبل أن نضيف ملفات شخصية، نريد أن نحمي حسابك الشخصي عن طريق إنشاء رقم تعريف شخصي. هذا يمكنك من السماح بالتنزيلات وإدارة الملفات الشخصية على الجهاز.</string>
+  <string name="admin_pin_activity_warning_text">لا تستخدم رقم تعريف شخصي استخدمته من قبل لحسابات الشخصية مثل حساب البنك أو حساب الضمان الإجتماعي.</string>
+  <string name="admin_pin_activity_input_new_pin_hint">رقم تعريف شخصي جديد مكون من 5 أرقام</string>
+  <string name="admin_pin_activity_input_confirm_pin_hint">تأكيد رقم التعريف الشخصي المكون من 5 أرقام</string>
+  <string name="admin_pin_activity_pin_length_error">رقم التعريف الشخصي يجب أن يتكون من 5 أرقام.</string>
+  <string name="admin_pin_activity_wrong_pin_text">برجاء التأكد من تطابق رقمي التعريف الشخصي.</string>
+  <string name="admin_pin_activity_submit_button_text">حفظ</string>
   <string name="admin_pin_activity_title">أمّن الحساب لإضافة ملفات شخصية</string>
-  <string name="add_profile_activity_label">إضافة ملف شخصي</string>
-  <string name="add_profile_title">إضافة ملف شخصي</string>
-  <string name="add_profile_input_name">الاسم</string>
-  <string name="add_profile_input_pin">رقم تعريف شخصي مكون من 3 أرقام</string>
-  <string name="add_profile_input_confirm_pin">تأكيد رقم التعريف الشخصي المكون من 3 أرقام</string>
-  <string name="add_profile_allow_download_heading">السماح بالوصول للتنزيل</string>
-  <string name="add_profile_allow_download_sub">المستخدم قادر على تنزيل ومسح المحتوى بدون رقم التعريف الشخصي الخاص بالمشرف.</string>
-  <string name="add_profile_create_btn">إنشاء</string>
-  <string name="add_profile_close">إغلاق</string>
-  <string name="add_profile_pin_info">مع وجود رقم التعريف الشخصي، لا يمكن لأي شخص آخر الوصول إلى الملف الشخصي بخلاف هذا المستخدم.</string>
-  <string name="add_profile_error_image_failed_store">فشلنا في حفظ الصورة. برجاء المحاولة مجددًا.</string>
-  <string name="add_profile_error_name_not_unique">هذا الاسم مستخدَم بالفعل من قبل ملف شخصي آخر.</string>
-  <string name="add_profile_error_name_empty">من فضلك أدخل اسمًا لهذا الملف الشخصي.</string>
-  <string name="add_profile_error_name_only_letters">يمكن أن يحتوي الاسم على أحرفٍ فقط، جرّب اسمًا آخر؟</string>
-  <string name="add_profile_error_pin_length">رقم التعريف الشخصي يجب أن يتكون من 3 أرقام.</string>
-  <string name="add_profile_error_pin_confirm_wrong">برجاء التأكد من تطابق رقمي التعريف الشخصي.</string>
-  <string name="add_profile_info_content_description">المزيد من المعلومات عن رقم التعريف الشخصي المكون من 3 أرقام.</string>
-  <string name="current_profile_picture_content_description">صورة الملف الشخصي الحالية.</string>
-  <string name="edit_profile_picture_content_description">تعديل صورة الملف الشخصي</string>
-  <string name="onboarding_slide_0_title">مرحبًا بكم في %s</string>
-  <string name="onboarding_slide_0_description">تعلّم أي شيءٍ تريده بطريقة فعّالة وممتعة.</string>
-  <string name="onboarding_slide_1_title">أضف مستخدمين إلى حسابك.</string>
-  <string name="onboarding_slide_1_description">شارك الخبرة وأنشئ حتى 10 ملفات شخصية.</string>
-  <string name="onboarding_slide_2_title">تنزيل لحالة عدم وجود الإنترنت.</string>
-  <string name="onboarding_slide_2_description">استمرّ في تعلّم دروسك بدون اتصال بالإنترنت.</string>
-  <string name="onboarding_slide_3_title">استمتع!</string>
-  <string name="onboarding_slide_3_description">استمتع بمغامراتك التعليمية مع دروسنا الفعّالة المجانية.</string>
-  <string name="skip">تخطي</string>
-  <string name="next_arrow">التالي</string>
-  <string name="get_started">ابدأ</string>
-  <string name="onboarding_slide_dots_content_description">شاشة العرض %s من %s</string>
-  <string name="pin_password_hello">أهلًا، %s!</string>
-  <string name="pin_password_admin_enter">من فضلك أدخل رقم التعريف الشخصي الخاص بالمشرف.</string>
-  <string name="pin_password_user_enter">من فضلك أدخل رقم التعريف الشخصي الخاص بك.</string>
-  <string name="input_pin_password_as_admin">رقم التعريف الشخصي للمسؤول المكون من 5 أرقام.</string>
-  <string name="input_pin_password_as_user">رقم التعريف الشخصي المكون من 3 أرقام للمستخدم.</string>
-  <string name="pin_password_forgot_pin">نسيت رقم التعريف الشخصي الخاص بي.</string>
-  <string name="pin_password_incorrect_pin">رقم تعريف شخصي غير صحيح.</string>
-  <string name="pin_password_show">عرض</string>
-  <string name="pin_password_hide">إخفاء</string>
-  <string name="pin_password_close">إغلاق</string>
-  <string name="pin_password_success">تم تغيير رقم التعريف الشخصي بنجاح</string>
-  <string name="pin_password_forgot_title">نسيت رقم التعريف الشخصي؟</string>
-  <string name="admin_forgot_pin_message">لإعادة ضبط رقم التعريف الشخصي PIN الخاص بك، إحذف تطبيق %s وأعد تثبيته مرة أخرى.\n\nضع في اعتبارك أنه إذا لم يكن الجهاز متصلاً بالإنترنت ، فقد تفقد تقدم المستخدم في حسابات متعددة.</string>
-  <string name="admin_forgot_pin_reset_app_data_button_text">إعادة تعيين بيانات %s</string>
-  <string name="admin_confirm_app_wipe_title">تأكيد إعادة تعيين بيانات %s</string>
-  <string name="admin_confirm_app_wipe_message">هل أنت متأكد من أنك تريد حذف كافة ملفات تعريف %s على هذا الجهاز؟ هذه العملية لا يمكن التراجع عنها.</string>
-  <string name="admin_confirm_app_wipe_positive_button_text">نعم</string>
-  <string name="admin_confirm_app_wipe_negative_button_text">لا</string>
-  <string name="show_hide_password_icon">إظهار/إخفاء أيقونة كلمة السر</string>
-  <string name="password_shown_icon">أيقونة كلمة المرور ظاهرة.</string>
-  <string name="password_hidden_icon">أيقونة كلمة المرور مخفية.</string>
-  <string name="enter_your_pin">أدخل رقم التعريف الشخصي الخاص بك</string>
-  <string name="pin_password_toolbar_title">أدخل رقم التعريف الشخصي</string>
-  <string name="admin_settings_label">رقم التعريف الشخصي الخاص بالمشرف</string>
-  <string name="admin_settings_heading">الوصول إلى إعدادات المشرف</string>
-  <string name="admin_settings_sub">رقم التعريف الشخصي الخاص بالمشرف مطلوب لتغيير رقم التعريف الشخصي الخاص بالمستخدم</string>
-  <string name="admin_settings_cancel">إلغاء</string>
-  <string name="admin_settings_submit">تقديم</string>
-  <string name="admin_settings_incorrect">رقم التعريف الشخصي الخاص بالمشرف غير صحيح. من فضلك حاول مجددًا.</string>
-  <string name="admin_settings_enter_user_new_pin">رقم التعريف الشخصي الجديد الخاص ب%1$s.</string>
-  <string name="reset_pin_enter">أدخل رقم تعريف شخصي جديد</string>
-  <string name="reset_pin_enter_dialog_message">سيكون رقم التعريف الشخصي هذا هو رقم التعريف الشخصي الجديد لـ %s وسيكون مطلوبًا عند تسجيل الدخول.</string>
+  <string name="add_profile_activity_title">إضافة ملف شخصي</string>
+  <string name="add_profile_activity_input_name_hint">الاسم</string>
+  <string name="add_profile_activity_input_pin_hint">رقم تعريف شخصي مكون من 3 أرقام</string>
+  <string name="add_profile_activity_input_confirm_pin_hint">تأكيد رقم التعريف الشخصي المكون من 3 أرقام</string>
+  <string name="add_profile_activity_allow_download_text">السماح بالوصول للتنزيل</string>
+  <string name="add_profile_activity_allow_download_sub_text">المستخدم قادر على تنزيل ومسح المحتوى بدون رقم التعريف الشخصي الخاص بالمشرف.</string>
+  <string name="add_profile_activity_create_button_text">إنشاء</string>
+  <string name="add_profile_activity_close_dialog_text">إغلاق</string>
+  <string name="add_profile_activity_pin_info_dialog_text">مع وجود رقم التعريف الشخصي، لا يمكن لأي شخص آخر الوصول إلى الملف الشخصي بخلاف هذا المستخدم.</string>
+  <string name="add_profile_activity_name_not_unique_error_text">هذا الاسم مستخدَم بالفعل من قبل ملف شخصي آخر.</string>
+  <string name="add_profile_activity_name_empty_error_text">من فضلك أدخل اسمًا لهذا الملف الشخصي.</string>
+  <string name="add_profile_activity_name_only_letters_error_text">يمكن أن يحتوي الاسم على أحرفٍ فقط، جرّب اسمًا آخر؟</string>
+  <string name="add_profile_activity_pin_length_error_text">رقم التعريف الشخصي يجب أن يتكون من 3 أرقام.</string>
+  <string name="add_profile_activity_wrong_confirm_pin_error_text">برجاء التأكد من تطابق رقمي التعريف الشخصي.</string>
+  <string name="add_profile_activity_info_image_content_description">المزيد من المعلومات عن رقم التعريف الشخصي المكون من 3 أرقام.</string>
+  <string name="add_profile_activity_edit_image_content_description">صورة الملف الشخصي الحالية.</string>
+  <string name="add_profile_activity_edit_user_image_content_description">تعديل صورة الملف الشخصي</string>
+  <string name="onboarding_activity_slide_0_title">مرحبًا بكم في %s</string>
+  <string name="onboarding_activity_slide_0_description">تعلّم أي شيءٍ تريده بطريقة فعّالة وممتعة.</string>
+  <string name="onboarding_activity_slide_1_title">أضف مستخدمين إلى حسابك.</string>
+  <string name="onboarding_activity_slide_1_description">شارك الخبرة وأنشئ حتى 10 ملفات شخصية.</string>
+  <string name="onboarding_activity_slide_2_title">تنزيل لحالة عدم وجود الإنترنت.</string>
+  <string name="onboarding_activity_slide_2_description">استمرّ في تعلّم دروسك بدون اتصال بالإنترنت.</string>
+  <string name="onboarding_activity_slide_3_title">استمتع!</string>
+  <string name="onboarding_activity_slide_3_description">استمتع بمغامراتك التعليمية مع دروسنا الفعّالة المجانية.</string>
+  <string name="onboarding_activity_skip_text">تخطي</string>
+  <string name="onboarding_activity_next_arrow_text">التالي</string>
+  <string name="onboarding_activity_get_started_text">ابدأ</string>
+  <string name="onboarding_activity_slide_dots_content_description">شاشة العرض %s من %s</string>
+  <string name="pin_password_activity_hello_text">أهلًا، %s!</string>
+  <string name="pin_password_activity_enter_text">من فضلك أدخل رقم التعريف الشخصي الخاص بالمشرف.</string>
+  <string name="pin_password_activity_user_enter_text">من فضلك أدخل رقم التعريف الشخصي الخاص بك.</string>
+  <string name="pin_password_activity_admin_input_pin_text">رقم التعريف الشخصي للمسؤول المكون من 5 أرقام.</string>
+  <string name="pin_password_activity_user_input_pin_text">رقم التعريف الشخصي المكون من 3 أرقام للمستخدم.</string>
+  <string name="pin_password_activity_forgot_pin_text">نسيت رقم التعريف الشخصي الخاص بي.</string>
+  <string name="pin_password_activity_incorrect_pin_error">رقم تعريف شخصي غير صحيح.</string>
+  <string name="pin_password_activity_show_pin_text">عرض</string>
+  <string name="pin_password_activity_hide_pin_text">إخفاء</string>
+  <string name="pin_password_activity_close_text">إغلاق</string>
+  <string name="pin_password_activity_success_text">تم تغيير رقم التعريف الشخصي بنجاح</string>
+  <string name="pin_password_activity_dialog_forgot_title">نسيت رقم التعريف الشخصي؟</string>
+  <string name="pin_password_activity_dialog_forgot_message">لإعادة ضبط رقم التعريف الشخصي PIN الخاص بك، إحذف تطبيق %s وأعد تثبيته مرة أخرى.\n\nضع في اعتبارك أنه إذا لم يكن الجهاز متصلاً بالإنترنت ، فقد تفقد تقدم المستخدم في حسابات متعددة.</string>
+  <string name="pin_password_activity_reset_app_data_button_text">إعادة تعيين بيانات %s</string>
+  <string name="pin_password_activity_reset_dialog_title">تأكيد إعادة تعيين بيانات %s</string>
+  <string name="pin_password_activity_reset_dialog_message">هل أنت متأكد من أنك تريد حذف كافة ملفات تعريف %s على هذا الجهاز؟ هذه العملية لا يمكن التراجع عنها.</string>
+  <string name="pin_password_activity_reset_dialog_postive_button_text">نعم</string>
+  <string name="pin_password_activity_reset_dialog_negative_button_text">لا</string>
+  <string name="pin_password_activity_shown_icon_content_description">أيقونة كلمة المرور ظاهرة.</string>
+  <string name="pin_password_activity_hidden_icon_content_description">أيقونة كلمة المرور مخفية.</string>
+  <string name="pin_password_activity_toolbar_title">أدخل رقم التعريف الشخصي</string>
+  <string name="admin_settings_dialog_input_pin_hint">رقم التعريف الشخصي الخاص بالمشرف</string>
+  <string name="admin_settings_dialog_heading">الوصول إلى إعدادات المشرف</string>
+  <string name="admin_settings_dialog_message_text">رقم التعريف الشخصي الخاص بالمشرف مطلوب لتغيير رقم التعريف الشخصي الخاص بالمستخدم</string>
+  <string name="admin_settings_dialog_cancel_button_text">إلغاء</string>
+  <string name="admin_settings_dialog_submit_button_text">تقديم</string>
+  <string name="admin_settings_dialog_incorrect_pin_error_text">رقم التعريف الشخصي الخاص بالمشرف غير صحيح. من فضلك حاول مجددًا.</string>
+  <string name="admin_settings_dialog_new_pin_text">رقم التعريف الشخصي الجديد الخاص ب%1$s.</string>
+  <string name="pin_password_activity_reset_pin_dialog_title">أدخل رقم تعريف شخصي جديد</string>
+  <string name="pin_password_activity_reset_pin_dialog_message">سيكون رقم التعريف الشخصي هذا هو رقم التعريف الشخصي الجديد لـ %s وسيكون مطلوبًا عند تسجيل الدخول.</string>
   <string name="my_downloads_activity_title">تنزيلاتي</string>
-  <string name="tab_downloads">التنزيلات</string>
-  <string name="tab_updates">التحديثات (2)</string>
+  <string name="my_downloads_fragment_tab_download_text">التنزيلات</string>
+  <string name="my_downloads_fragment_tab_updates_text">التحديثات (2)</string>
   <string name="home_activity_back_dialog_message">هل تريد الخروج من ملفك الشخصي؟</string>
-  <string name="home_activity_back_dialog_cancel">إلغاء</string>
-  <string name="home_activity_back_dialog_exit">خروج</string>
+  <string name="home_activity_back_dialog_cancel_button">إلغاء</string>
+  <string name="home_activity_back_dialog_exit_button">خروج</string>
   <string name="home_activity_title">الصفحة الرئيسية</string>
-  <string name="promoted_story_spotlight_hint">من الآن يمكنك مشاهدة الدروس المقترحة لك هنا.</string>
-  <string name="select_a_topic_to_start">حدد موضوعًا للبدء</string>
+  <string name="home_story_promoted_story_spotlight_hint">من الآن يمكنك مشاهدة الدروس المقترحة لك هنا.</string>
+  <string name="home_activity_all_topics_text">حدد موضوعًا للبدء</string>
   <string name="profile_list_activity_title">الملفات الشخصية</string>
   <string name="profile_edit_activity_title">تعديل الملفات الشخصية</string>
-  <string name="profile_edit_created">تم الإنشاء في %s</string>
-  <string name="profile_last_used">آخر استخدام</string>
-  <string name="profile_edit_rename">تغيير الاسم</string>
-  <string name="profile_edit_reset">إعادة ضبط رقم التعريف الشخصي</string>
-  <string name="profile_edit_mark_chapter_completion">علم الفصول المكتملة</string>
-  <string name="profile_edit_enable_quick_lesson_language_switching_label">شغل مبدل اللغات السريع</string>
-  <string name="profile_edit_enable_quick_lesson_language_switching_explanation">السماح لهذا المستخدم بالتبديل بسرعة بين اللغة الإنجليزية والسواحيلية ضمن درس.</string>
-  <string name="profile_edit_delete">حذف الملف الشخصي</string>
-  <string name="profile_edit_delete_dialog_title">هل تريد حذف هذا الملف الشخصي نهائيًا؟</string>
-  <string name="profile_edit_delete_dialog_message">سيتم حذف كل التقدم ولن تتمكن من استعادته.</string>
-  <string name="profile_edit_delete_dialog_positive">حذف</string>
-  <string name="profile_edit_delete_dialog_negative">إلغاء</string>
-  <string name="profile_edit_allow_download_heading">السماح بالوصول للتنزيل</string>
-  <string name="profile_edit_allow_download_sub">المستخدم قادر على تنزيل ومسح المحتوى بدون كلمة السر الخاصة بالمشرف.</string>
+  <string name="profile_edit_activity_created_text">تم الإنشاء في %s</string>
+  <string name="profile_edit_activity_last_used_text">آخر استخدام</string>
+  <string name="profile_edit_activity_rename_text">تغيير الاسم</string>
+  <string name="profile_edit_activity_reset_text">إعادة ضبط رقم التعريف الشخصي</string>
+  <string name="profile_edit_activity_mark_chapters_for_completion_button_text">علم الفصول المكتملة</string>
+  <string name="profile_edit_activity_switching_header_text">شغل مبدل اللغات السريع</string>
+  <string name="profile_edit_activity_switching_label_text">السماح لهذا المستخدم بالتبديل بسرعة بين اللغة الإنجليزية والسواحيلية ضمن درس.</string>
+  <string name="profile_edit_activity_delete_button_text">حذف الملف الشخصي</string>
+  <string name="profile_edit_activity_dialog_title">هل تريد حذف هذا الملف الشخصي نهائيًا؟</string>
+  <string name="profile_edit_activity_dialog_message">سيتم حذف كل التقدم ولن تتمكن من استعادته.</string>
+  <string name="profile_edit_activity_dialog_positive_button">حذف</string>
+  <string name="profile_edit_activity_dialog_negative_button">إلغاء</string>
+  <string name="profile_edit_activity_allow_download_heading">السماح بالوصول للتنزيل</string>
+  <string name="profile_edit_activity_allow_download_sub">المستخدم قادر على تنزيل ومسح المحتوى بدون كلمة السر الخاصة بالمشرف.</string>
   <string name="profile_picture_activity_title">صورة الملف الشخصي</string>
-  <string name="profile_progress_edit_dialog_title">صورة الملف الشخصي</string>
-  <string name="profile_picture_edit_alert_dialog_cancel_button">إلغاء</string>
-  <string name="profile_picture_edit_alert_dialog_view_profile_picture">عرض صورة الملف الشخصي</string>
-  <string name="profile_picture_edit_alert_dialog_choose_from_library">اختيار من المعرض</string>
+  <string name="profile_picture_edit_dialog_title">صورة الملف الشخصي</string>
+  <string name="profile_picture_edit_dialog_cancel_button_text">إلغاء</string>
+  <string name="profile_picture_edit_dialog_view_picture_text">عرض صورة الملف الشخصي</string>
+  <string name="profile_picture_edit_dialog_change_picture_text">اختيار من المعرض</string>
   <string name="profile_rename_activity_title">إعادة تسمية الملف الشخصي</string>
-  <string name="profile_rename_label">الاسم الجديد</string>
-  <string name="profile_rename_save" fuzzy="true">حفظ</string>
+  <string name="profile_rename_activity_rename_input_hint">الاسم الجديد</string>
+  <string name="profile_rename_activity_rename_save_button" fuzzy="true">حفظ</string>
   <string name="profile_reset_pin_activity_title">إعادة ضبط رقم التعريف الشخصي</string>
-  <string name="profile_reset_pin_main">أدخل رقم تعريف شخصي جديد للمستخدم كي يستخدمه عند الدخول إلى ملفه الشخصي.</string>
-  <string name="profile_reset_pin_user_pin_label">رقم تعريف شخصي مكون من 3 أرقام</string>
-  <string name="profile_reset_pin_admin_pin_label">رقم تعريف شخصي مكون من 5 أرقام</string>
-  <string name="profile_reset_pin_user_confirm_label">تأكيد رقم التعريف الشخصي المكون من 3 أرقام</string>
-  <string name="profile_reset_pin_admin_confirm_label">تأكيد رقم التعريف الشخصي المكون من 5 أرقام</string>
-  <string name="profile_reset_pin_error_user_pin_length">رقم التعريف الشخصي يجب أن يتكون من 3 أرقام.</string>
-  <string name="profile_reset_pin_error_admin_pin_length">رقم التعريف الشخصي يجب أن يتكون من 5 أرقام.</string>
-  <string name="add_profile_create_a_3_digit_pin">إنشاء رقم تعريف شخصي مكون من 3 أرقام</string>
-  <string name="add_profile_required">مطلوب</string>
-  <string name="back_button">زر العودة</string>
-  <string name="next">التالي</string>
-  <string name="administrator_controls_general_label">عام</string>
-  <string name="administrator_controls_edit_account">تعديل الحساب</string>
-  <string name="administrator_controls_profile_management_label">إدارة الملف الشخصي</string>
-  <string name="administrator_controls_edit_profiles">تعديل الملفات الشخصية</string>
-  <string name="administrator_controls_download_permissions_label">أُذونات التنزيل</string>
-  <string name="administrator_controls_update_on_wifi_title">تنزيل وتحديث عن طريق شبكة الوايفاي فقط</string>
-  <string name="administrator_controls_update_on_wifi_message">سيتم تحميل وتحديث المواضيع عن طريق شبكة الوايفاي فقط. أي تنزيلات أو تحديثات عن طريق بيانات الهاتف سيتم وضعها في قائمة الانتظار.</string>
-  <string name="administrator_controls_auto_update_title">تحديث المواضيع تلقائيًا</string>
-  <string name="administrator_controls_auto_update_message">سيتم تحديث الموضوعات التي تم تنزيلها والتي يتوفر بها محتوى جديد تلقائيًا.</string>
-  <string name="administrator_controls_app_information_label">معلومات التطبيق</string>
-  <string name="administrator_controls_app_version">إصدار التطبيق</string>
-  <string name="administrator_controls_account_actions_label">إجراءات الحساب</string>
-  <string name="administrator_controls_log_out">تسجيل الخروج</string>
-  <string name="log_out_dialog_cancel_button">إلغاء</string>
-  <string name="log_out_dialog_okay_button">حسنا</string>
-  <string name="log_out_dialog_message">هل أنت متأكد من رغبتك في تسجيل الخروج من ملفك الشخصي؟</string>
-  <string name="app_version_name">إصدار التطبيق %s</string>
-  <string name="app_last_update_date">تم تثبيت آخر إصدار في %s. قم باستخدام رقم الإصدار في الأعلى للإبلاغ عن أعطال التطبيق.</string>
+  <string name="profile_reset_pin_fragment_reset_pin_main_text">أدخل رقم تعريف شخصي جديد للمستخدم كي يستخدمه عند الدخول إلى ملفه الشخصي.</string>
+  <string name="profile_reset_pin_fragment_user_pin_text">رقم تعريف شخصي مكون من 3 أرقام</string>
+  <string name="profile_reset_pin_fragment_admin_pin_text">رقم تعريف شخصي مكون من 5 أرقام</string>
+  <string name="profile_reset_pin_fragment_user_confirm_text">تأكيد رقم التعريف الشخصي المكون من 3 أرقام</string>
+  <string name="profile_reset_pin_fragment_admin_confirm_text">تأكيد رقم التعريف الشخصي المكون من 5 أرقام</string>
+  <string name="profile_reset_pin_fragment_error_user_pin_length">رقم التعريف الشخصي يجب أن يتكون من 3 أرقام.</string>
+  <string name="profile_reset_pin_fragment_error_admin_pin_length">رقم التعريف الشخصي يجب أن يتكون من 5 أرقام.</string>
+  <string name="add_profile_activity_pin_check_box_text">إنشاء رقم تعريف شخصي مكون من 3 أرقام</string>
+  <string name="add_profile_activity_user_name_helper_text">مطلوب</string>
+  <string name="walkthrough_activity_back_button_text">زر العودة</string>
+  <string name="next_text">التالي</string>
+  <string name="administrator_controls_fragment_general_label">عام</string>
+  <string name="administrator_controls_fragment_edit_account_text">تعديل الحساب</string>
+  <string name="administrator_controls_fragment_profile_management_label">إدارة الملف الشخصي</string>
+  <string name="administrator_controls_fragment_edit_profiles_text">تعديل الملفات الشخصية</string>
+  <string name="administrator_controls_fragment_download_permissions_label">أُذونات التنزيل</string>
+  <string name="administrator_controls_fragment_topic_update_on_wifi_text">تنزيل وتحديث عن طريق شبكة الوايفاي فقط</string>
+  <string name="administrator_controls_fragment_topic_update_on_wifi_description">سيتم تحميل وتحديث المواضيع عن طريق شبكة الوايفاي فقط. أي تنزيلات أو تحديثات عن طريق بيانات الهاتف سيتم وضعها في قائمة الانتظار.</string>
+  <string name="administrator_controls_fragment_auto_update_topic_text">تحديث المواضيع تلقائيًا</string>
+  <string name="administrator_controls_fragment_auto_update_topic_description">سيتم تحديث الموضوعات التي تم تنزيلها والتي يتوفر بها محتوى جديد تلقائيًا.</string>
+  <string name="administrator_controls_fragment_app_information_text">معلومات التطبيق</string>
+  <string name="administrator_controls_fragment_app_version_text">إصدار التطبيق</string>
+  <string name="administrator_controls_fragment_account_actions_text">إجراءات الحساب</string>
+  <string name="administrator_controls_fragment_log_out_text">تسجيل الخروج</string>
+  <string name="log_out_dialog_cancel_button_text">إلغاء</string>
+  <string name="log_out_dialog_okay_button_text">حسنا</string>
+  <string name="log_out_dialog_message_text">هل أنت متأكد من رغبتك في تسجيل الخروج من ملفك الشخصي؟</string>
+  <string name="app_version_fragment_version_name_text">إصدار التطبيق %s</string>
+  <string name="app_version_fragment_last_update_date_text">تم تثبيت آخر إصدار في %s. قم باستخدام رقم الإصدار في الأعلى للإبلاغ عن أعطال التطبيق.</string>
   <string name="app_version_activity_title">إصدار التطبيق</string>
   <string name="app_language_activity_title">لغة التطبيق</string>
   <string name="audio_language_activity_title" fuzzy="true">لغة الصوت الافتراضية</string>
   <string name="reading_text_size_activity_title">حجم النص المقروء</string>
-  <string name="title_reading_text_size">حجم النص المقروء</string>
-  <string name="story_text_will_look_like_this">سيظهر نص القصة بهذا الشكل.</string>
-  <string name="constant_string_for_text_size">أ</string>
-  <string name="audio_language" fuzzy="true">الصوت الافتراضي</string>
-  <string name="app_language">لغة التطبيق</string>
-  <string name="reading_text_size">حجم النص المقروء</string>
-  <string name="reading_text_size_small">صغير</string>
-  <string name="reading_text_size_medium">متوسط</string>
-  <string name="reading_text_size_large">كبير</string>
-  <string name="reading_text_size_extra_large">كبير جدًا</string>
-  <string name="slide_seekbar_to_control_text_size">شريط تغيير حجم النص.</string>
-  <string name="profile">الملف الشخصي</string>
-  <string name="story_count_text_view">قصتان</string>
-  <string name="topics_in_progress">من المواضيع في تقدم</string>
-  <string name="topic_in_progress">موضوع في تقدم</string>
-  <string name="stories_completed">قصص مكتملة</string>
-  <string name="story_completed">قصة مكتملة</string>
+  <string name="option_activity_audio_language_text" fuzzy="true">الصوت الافتراضي</string>
+  <string name="option_activity_app_language_text">لغة التطبيق</string>
+  <string name="option_activity_reading_text_size">حجم النص المقروء</string>
+  <string name="option_activity_reading_text_size_small">صغير</string>
+  <string name="option_activity_reading_text_size_medium">متوسط</string>
+  <string name="option_activity_reading_text_size_large">كبير</string>
+  <string name="option_activity_reading_text_size_extra_large">كبير جدًا</string>
+  <string name="profile_progress_activity_profile_title">الملف الشخصي</string>
+  <string name="profile_progress_activity_topics_in_progress_text">من المواضيع في تقدم</string>
+  <string name="profile_progress_activity_topic_in_progress_text">موضوع في تقدم</string>
+  <string name="profile_progress_activity_stories_completed_text">قصص مكتملة</string>
+  <string name="profile_progress_activity_story_completed_text">قصة مكتملة</string>
   <string name="options_activity_title">خيارات</string>
   <string name="completed_story_list_activity_title">قصص مكتملة</string>
   <string name="walkthrough_activity_title">تجول التطبيق</string>
-  <string name="walkthrough_welcome_description">تعلّم مهارات حسابية جديدة عن طريق القصص التي توضح لك كيف تستخدمها في حياتك اليومية</string>
-  <string name="welcome">\"مرحبًا %s\"</string>
-  <string name="what_do_you_want_to_learn">ما الذي تريد أن تتعلمه؟</string>
-  <string name="great">عظيم</string>
-  <string name="lets_get_started">هيّا نبدأ.</string>
-  <string name="yes">نعم</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>
-  <string name="no_new_hint_available">لا يوجد تلميح جديد متاح</string>
-  <string name="show_hints_and_solution">إظهار الملاحظات والحل</string>
-  <string name="hint_list_item_number">تلميح %s</string>
-  <string name="hints_and_solution_close_icon_description" fuzzy="true">العودة للسابق</string>
-  <string name="hints_toolbar_title">الملاحظات</string>
-  <string name="show_solution">عرض الحل</string>
-  <string name="reveal_solution">عرض الحل</string>
-  <string name="hint_list_solution_title">الحل</string>
-  <string name="reveal_hint">عرض الملاحظة</string>
-  <string name="hide_hint">إخفاء تلميح</string>
-  <string name="hide_solution">إخفاء الحل</string>
-  <string name="hints_list_exclusive_solution_text">الحل الوحيد هو :%s</string>
-  <string name="hints_list_possible_solution_text">أحد الاجابات هي : %s</string>
-  <string name="this_will_reveal_the_solution">سوف يتم إظهار الحل. هل أنت متأكد؟</string>
-  <string name="reveal">إظهار</string>
+  <string name="walkthrough_activity_welcome_description">تعلّم مهارات حسابية جديدة عن طريق القصص التي توضح لك كيف تستخدمها في حياتك اليومية</string>
+  <string name="walkthrough_activity_welcome_text">\"مرحبًا %s\"</string>
+  <string name="walkthrough_activity_topic_header_text">ما الذي تريد أن تتعلمه؟</string>
+  <string name="walkthrough_activity_final_title_text">عظيم</string>
+  <string name="walkthrough_activity_get_started_text">هيّا نبدأ.</string>
+  <string name="walkthrough_activity_yes_text">نعم</string>
+  <string name="walkthrough_activity_no_text">لا...</string>
+  <string name="walkthrough_activity_pick_different_topic_text">اختر موضوعًا\nآخرًا.</string>
+  <string name="walkthrough_activity_are_you_interested_text">هل أنت مهتم بـ:\n%s</string>
+  <string name="question_player_activity_new_hint_available_text">ملاحظة جديدة متاحة</string>
+  <string name="state_fragment_hint_bulb_content_description">لا يوجد تلميح جديد متاح</string>
+  <string name="state_fragment_open_hint_content_description">إظهار الملاحظات والحل</string>
+  <string name="hint_solution_dialog_hint_list_item_number">تلميح %s</string>
+  <string name="hint_solution_dialog_close_icon_description" fuzzy="true">العودة للسابق</string>
+  <string name="state_fragment_hint_bar_title">الملاحظات</string>
+  <string name="hint_solution_dialog_show_solution_text">عرض الحل</string>
+  <string name="hint_solution_dialog_reveal_solution_text">عرض الحل</string>
+  <string name="hint_solution_dialog_solution_text">الحل</string>
+  <string name="hint_solution_dialog_reveal_hint_text">عرض الملاحظة</string>
+  <string name="hint_solution_dialog_hide_hint_description">إخفاء تلميح</string>
+  <string name="hint_solution_dialog_hide_solution_description">إخفاء الحل</string>
+  <string name="hint_solution_dialog_exclusive_solution_text">الحل الوحيد هو :%s</string>
+  <string name="hint_solution_dialog_possible_solution_text">أحد الاجابات هي : %s</string>
+  <string name="hint_solution_dialog_reveal_dialog_solution_text">سوف يتم إظهار الحل. هل أنت متأكد؟</string>
+  <string name="hint_solution_dialog_reveal_dialog_button_text">إظهار</string>
   <string name="just_now">الآن</string>
   <string name="last_logged_in_recently">حديثاً</string>
   <string name="yesterday">أمس</string>
-  <string name="return_to_topic">العودة إلى الموضوع</string>
-  <string name="return_to_lesson">العودة إلى الدرس</string>
-  <string name="explanation">الشرح:</string>
-  <string name="drag_and_drop_interaction_group_merge_hint">إذا تساوى عنصران، قم بدمجهم.</string>
-  <string name="link_to_item_below">الربط بالعنصر %s</string>
-  <string name="unlink_items">إلغاء ربط العناصر عند %s</string>
-  <string name="move_item_down_content_description">تحريك العنصر إلى الأسفل إلى %s</string>
-  <string name="move_item_up_content_description">تحريك العنصر إلى الأعلى عند %s</string>
-  <string name="up_button_disabled">أعلى</string>
-  <string name="down_button_disabled">أسفل</string>
+  <string name="hint_solution_dialog_explanation_text">الشرح:</string>
+  <string name="state_fragment_drag_drop_interaction_group_merge_hint">إذا تساوى عنصران، قم بدمجهم.</string>
+  <string name="state_fragment_drag_drop_interaction_link_to_item_below">الربط بالعنصر %s</string>
+  <string name="state_fragment_drag_drop_interaction_unlink_items">إلغاء ربط العناصر عند %s</string>
+  <string name="state_fragment_drag_drop_interaction_move_item_down_content_description">تحريك العنصر إلى الأسفل إلى %s</string>
+  <string name="state_fragment_drag_drop_interaction_move_item_up_content_description">تحريك العنصر إلى الأعلى عند %s</string>
+  <string name="state_fragment_drag_drop_interaction_up_button_disabled">أعلى</string>
+  <string name="state_fragment_drag_drop_interaction_down_button_disabled">أسفل</string>
   <string name="profile_last_visited">%s %s</string>
-  <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">برجاء اختيار خيار واحد على الأقل.</string>
+  <string name="topic_fragment_revision_recyclerview_tag">topic_revision_recyclerview_tag</string>
+  <string name="ongoing_topic_list_fragment_recycler_view_tag">ongoing_recycler_view_tag</string>
   <string name="unsupported_app_version_dialog_title" fuzzy="true">إصدار تطبيق غير مدعوم</string>
   <string name="unsupported_app_version_dialog_message" fuzzy="true">هذا الإصدار من التطبيق لم يعد مدعومًا. من فضلك قم بتحديث التطبيق من خلال متجر بلاي (Play Store)</string>
   <string name="unsupported_app_version_dialog_close_button_text" fuzzy="true">إغلاق التطبيق</string>
-  <string name="splash_screen_developer_label">بناء المطور</string>
-  <string name="splash_screen_alpha_label">ألفا</string>
-  <string name="splash_screen_beta_label">بيتا</string>
+  <string name="splash_activity_build_developer_label">بناء المطور</string>
+  <string name="splash_activity_build_alpha_label">ألفا</string>
+  <string name="splash_activity_build_beta_label">بيتا</string>
   <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_message_text">مرحبًا! يتم الآن تحديث تطبيقك إلى الإصدار التجريبي. إذا واجهت مشاكل أثناء استخدام التطبيق ، أو كانت لديك أسئلة ، فيرجى الاتصال بنا على android-feedback@oppia.org.</string>
+  <string name="beta_notice_dialog_preference_checkbox_text">لا تظهر هذه الرسالة مرة أخرى</string>
   <string name="beta_notice_dialog_close_button_text">نعم</string>
+  <string name="hint_solution_dialog_return_to_lesson_button">العودة إلى الدرس</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="ratio_content_description_separator" fuzzy="true">إلى</string>
   <string name="ratio_default_hint_text" fuzzy="true">أدخل نسبة في الصيغة س:ص.</string>
-  <string name="text_input_default_hint_text">انقر هنا لإدخال نص.</string>
-  <string name="smallest_text_size_content_description">أصغر حجمًا للنص</string>
-  <string name="largest_text_size_content_description">أكبر حجمًا للنص</string>
+  <string name="state_fragment_text_input_default_hint_text">انقر هنا لإدخال نص.</string>
   <string name="coming_soon">قريباً</string>
   <string name="recommended_stories">قصص موصّى بها</string>
   <string name="stories_for_you">قصص من أجلك</string>
   <string name="question_player_activity_title">وضع الممارسة</string>
   <string name="revision_card_activity_title">صفحة مراجعة المهارات</string>
-  <string name="audio_player_seekbar_content_description">تقدم الصوت</string>
-  <string name="audio_language_icon_content_description">تغيير اللغة</string>
-  <string name="audio_player_on">الصوت مشغل</string>
-  <string name="audio_player_off">الصوت متوقف</string>
-  <string name="correct_submitted_answer">إجابة مقدمة صحيحة</string>
-  <string name="correct_submitted_answer_with_append">إجابة مقدمة صحيحة: %s</string>
-  <string name="incorrect_submitted_answer">إجابة مقدمة غير صحيحة</string>
-  <string name="incorrect_submitted_answer_with_append">إجابة مقدمة غير صحيحة: %s</string>
+  <string name="audio_fragment_progress_seek_bar_content_description">تقدم الصوت</string>
+  <string name="audio_fragment_language_icon_content_description">تغيير اللغة</string>
+  <string name="exploration_activity_audio_player_on_text">الصوت مشغل</string>
+  <string name="exploration_activity_audio_player_off_text">الصوت متوقف</string>
+  <string name="state_fragment_correct_submitted_answer">إجابة مقدمة صحيحة</string>
+  <string name="state_fragment_correct_submitted_answer_with_append">إجابة مقدمة صحيحة: %s</string>
+  <string name="state_fragment_incorrect_submitted_answer">إجابة مقدمة غير صحيحة</string>
+  <string name="state_fragment_incorrect_submitted_answer_with_append">إجابة مقدمة غير صحيحة: %s</string>
   <string name="third_party_dependency_list_activity_title">مكتبات برمجية (Third-party Dependencies)</string>
   <string name="third_party_dependency_version_formatter">إصدار %s</string>
   <string name="license_list_activity_title">رخص حقوق النسخ</string>
   <string name="license_text_viewer_activity_title">عارض رخصة حقوق النسخ</string>
   <string name="help_activity_back_arrow_description">انتقل مرة أخرى إلى %s</string>
-  <string name="help_activity_third_party_dependencies_list">قائمة تبعيات الطرف الثالث</string>
-  <string name="help_activity_copyright_licenses_list">قائمة تراخيص حقوق النشر</string>
+  <string name="help_activity_third_party_dependencies_text">قائمة تبعيات الطرف الثالث</string>
+  <string name="help_activity_copyright_licenses_text">قائمة تراخيص حقوق النشر</string>
   <string name="resume_lesson_activity_title">استئناف الدرس</string>
-  <string name="resume_lesson_button">تابع</string>
-  <string name="start_over_lesson_button">ابدأ من جديد</string>
-  <string name="home_screen_good_morning_greeting_fragment">صباح الخير</string>
-  <string name="home_screen_good_afternoon_greeting_fragment">مساء الخير</string>
-  <string name="home_screen_good_evening_greeting_fragment">مساء الخير،</string>
+  <string name="resume_lessons_fragment_continue_button_text">تابع</string>
+  <string name="resume_lessons_fragment_start_over_button_text">ابدأ من جديد</string>
+  <string name="home_activity_good_morning_greeting_text">صباح الخير</string>
+  <string name="home_activity_good_afternoon_greeting_text">مساء الخير</string>
+  <string name="home_activity_good_evening_greeting_text">مساء الخير،</string>
   <string name="policy_activity_title">صفحة السياسة</string>
-  <string name="privacy_policy_title">سياسة الخصوصية</string>
-  <string name="privacy_policy_web_link">يرجى زيارة &lt;a href=\"https://www.oppia.org/privacy-policy\"&gt;هذه الصفحة&lt;/a&gt; للحصول على أحدث إصدار من سياسة الخصوصية هذه.</string>
-  <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="policy_activity_privacy_policy_title">سياسة الخصوصية</string>
+  <string name="policy_activity_privacy_web_link">يرجى زيارة &lt;a href=\"https://www.oppia.org/privacy-policy\"&gt;هذه الصفحة&lt;/a&gt; للحصول على أحدث إصدار من سياسة الخصوصية هذه.</string>
+  <string name="policy_activity_terms_of_service_title">شروط الخدمة</string>
+  <string name="policy_activity_agree_to_terms_text">باستخدام %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="policy_activity_terms_web_link">يرجى زيارة &lt;a href=\"https://www.oppia.org/terms\"&gt;هذه الصفحة&lt;/a&gt; للحصول على أحدث نسخة من هذه الشروط.</string>
   <string name="faq_question_1">كيف يمكنني إنشاء ملف تعريف(حساب) جديد؟</string>
   <string name="faq_question_2">كيف يمكنني حذف ملف التعريف(حساب)؟</string>
   <string name="faq_question_3">كيف يمكنني تغيير بريدي الإلكتروني / رقم هاتفي؟</string>
@@ -514,9 +486,9 @@
   <string name="faq_answer_6">&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_7">&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_9">&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>
-  <string name="revision_navigation_cards_header">أكمل دراستك</string>
+  <string name="profile_edit_fragment_test_activity_title">نشاط اختبار جزء تحرير ملف التعريف</string>
+  <string name="administrator_controls_fragment_test_activity_title">يتحكم المسؤول في نشاط اختبار التجزئة</string>
+  <string name="revision_card_fragment_continue_studying_text">أكمل دراستك</string>
   <string name="state_fragment_hint_bar_forced_announcement_text">انتقل إلى الجزء السفلي من الشاشة للحصول على تلميح.</string>
   <string name="state_fragment_item_selection_no_items_selected_hint_text">اختر كل الإجابات الصحيحة من فضلك.</string>
   <string name="state_fragment_item_selection_some_items_selected_hint_text">يمكنك أن تختار المزيد من الخيارات</string>
diff --git a/app/src/main/res/values-pcm-rNG/strings.xml b/app/src/main/res/values-pcm-rNG/strings.xml
index b79f8985c41..9c61b8fb411 100644
--- a/app/src/main/res/values-pcm-rNG/strings.xml
+++ b/app/src/main/res/values-pcm-rNG/strings.xml
@@ -6,165 +6,150 @@
 * Yigakpoa
 -->
 <resources>
-  <string name="nav_header_desc">Navigation header</string>
-  <string name="menu_options">Options</string>
-  <string name="menu_my_downloads">My Downloads</string>
-  <string name="menu_help">Help</string>
+  <string name="menu_options_text">Options</string>
+  <string name="navigation_drawer_fragment_menu_my_downloads_text">My Downloads</string>
+  <string name="menu_help_text">Help</string>
   <string name="exploration_activity_title">Lesson Player</string>
-  <string name="play_exploration_button_text">play exploration</string>
+  <string name="exploration_activity_play_button_text">play exploration</string>
   <string name="help_activity_title">Help</string>
-  <string name="bottom_sheet_options_menu_close">Close</string>
-  <string name="menu_switch_profile">Change Profile</string>
-  <string name="developer_options">Developer Options</string>
-  <string name="administrator_controls">Administrator Controls</string>
-  <string name="drawer_open_content_description">Navigation Menu Open</string>
-  <string name="drawer_close_content_description">Navigation Menu Close</string>
-  <string name="audio_play_description">Play di audio</string>
-  <string name="audio_pause_description">Pause di audio</string>
-  <string name="audio_unavailable_in_selected_language">%s audio no dey available.</string>
-  <string name="audio_language_select_dialog_okay_button">OK</string>
-  <string name="audio_language_select_dialog_cancel_button">Cancel am</string>
-  <string name="audio_language_select_dialog_title">Audio Language</string>
-  <string name="audio_dialog_offline_title">You dey offline</string>
-  <string name="audio_dialog_offline_message">Make sure sey Wi-Fi or mobile data dey on, den try am again.</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">Cancel am</string>
-  <string name="cellular_data_alert_dialog_title">Na your data you dey use now</string>
-  <string name="cellular_data_alert_dialog_description">Playing di audio go use plenti mobile data.</string>
-  <string name="cellular_data_alert_dialog_checkbox">No show this message again</string>
-  <string name="concept_card_toolbar_title">Concept Card</string>
-  <string name="concept_card_one_button_text">Concept Card 1</string>
-  <string name="concept_card_two_button_text">Concept Card 2</string>
-  <string name="revision_card_toolbar_title">Revision Card</string>
+  <string name="exploration_activity_options_menu_close_text">Close</string>
+  <string name="navigation_drawer_fragment_switch_profile">Change Profile</string>
+  <string name="navigation_drawer_fragment_developer_options">Developer Options</string>
+  <string name="administrator_controls_activity_title">Administrator Controls</string>
+  <string name="navigation_drawer_fragment_open_content_description">Navigation Menu Open</string>
+  <string name="navigation_drawer_fragment_close_content_description">Navigation Menu Close</string>
+  <string name="audio_fragment_play_description">Play di audio</string>
+  <string name="audio_fragment_pause_description">Pause di audio</string>
+  <string name="audio_fragment_audio_unavailable_text">%s audio no dey available.</string>
+  <string name="audio_language_dialog_okay_button_text">OK</string>
+  <string name="audio_language_dialog_cancel_button_text">Cancel am</string>
+  <string name="audio_language_dialog_title">Audio Language</string>
+  <string name="audio_fragment_offline_dialog_title">You dey offline</string>
+  <string name="audio_fragment_offline_dialog_message">Make sure sey Wi-Fi or mobile data dey on, den try am again.</string>
+  <string name="audio_fragment_offline_dialog_positive_button_text">OK</string>
+  <string name="cellular_audio_dialog_okay_button_text">OK</string>
+  <string name="cellular_audio_dialog_cancel_button_text">Cancel am</string>
+  <string name="cellular_audio_dialog_title">Na your data you dey use now</string>
+  <string name="cellular_audio_dialog_description">Playing di audio go use plenti mobile data.</string>
+  <string name="cellular_audio_dialog_checkboxes_text">No show this message again</string>
+  <string name="concept_card_fragment_title">Concept Card</string>
+  <string name="concept_card_test_activity_button_one_text">Concept Card 1</string>
+  <string name="concept_card_test_activity_button_two_text">Concept Card 2</string>
   <string name="unsaved_exploration_dialog_title">Comot go the topic page?</string>
   <string name="unsaved_exploration_dialog_description">Wetin you don do before no go save</string>
-  <string name="unsaved_exploration_dialog_leave_button">Comot</string>
-  <string name="unsaved_exploration_dialog_cancel_button">Kansu-am</string>
+  <string name="unsaved_exploration_dialog_leave_button_text">Comot</string>
+  <string name="unsaved_exploration_dialog_cancel_button_text">Kansu-am</string>
   <string name="stop_exploration_dialog_title">Comot go the topic page?</string>
   <string name="stop_exploration_dialog_description">Your progress no go save.</string>
-  <string name="stop_exploration_dialog_cancel_button">Kansu-am</string>
-  <string name="stop_exploration_dialog_leave_button">Comot</string>
-  <string name="exploration_exit_button_spotlight_hint">Use dis button take comot anytime. We go save your progress.</string>
-  <string name="voiceover_icon_spotlight_hint">You go like make %s read for you? Click on dis button to try am.</string>
-  <string name="voiceover_language_icon_spotlight_hint">Click here to change voiceover language.</string>
-  <string name="progress_database_full_dialog_title">Ei don reach di highest storage capacity</string>
-  <string name="progress_database_full_dialog_description">Di saved progress for di lesson %s go comot.</string>
-  <string name="progress_database_full_dialog_continue_button">Continue</string>
-  <string name="progress_database_full_dialog_leave_without_saving_progress_button">Comot without saving progress</string>
-  <string name="progress_database_full_dialog_back_to_lesson_button">Back to di lesson</string>
-  <string name="topic_practice_master_these_skills">Cram dese skills</string>
-  <string name="topic_name_text_view">Ratios and Proportional Reasoning</string>
-  <string name="topic_practice_skills_description">Choose skills wey you go like to practice.</string>
-  <string name="topic_practice_start">Start</string>
-  <string name="info_tab_content_description">Things about di topic.</string>
-  <string name="revision_tab_content_description">Revise di concepts you learn from di lessons wey you don complete here.</string>
-  <string name="practice_tab_content_description">Practice di concepts wey you learn from lessons wey you don complete.</string>
-  <string name="lessons_tab_content_description">Click here to start to play di lesson.</string>
-  <string name="topic_lessons_tab_spotlight_hint">Find all your lessons for here.</string>
-  <string name="topic_revision_tab_spotlight_hint">Revise concepts wey you learn from lessons wey you don complete here.</string>
-  <string name="first_chapter_spotlight_hint">Click here to start to play a lesson.</string>
-  <string name="state_continue_button">Continue</string>
-  <string name="state_continue_submit">Submit</string>
-  <string name="previous_state_description">Go di former card</string>
-  <string name="next_state_description">Go di next card</string>
-  <string name="state_submit_button">Submit</string>
-  <string name="submit_button_text">Submit</string>
-  <string name="lesson_replay_button_text">Replay</string>
-  <string name="state_end_exploration_button">Return To Di Topic</string>
-  <string name="previous_responses_header">Former reply (%s)</string>
-  <string name="image_interaction_answer_text">Clicks on %s</string>
-  <string name="state_learn_again_button">Learn Am Again</string>
-  <string name="see_more">See More</string>
-  <string name="see_less">See Less</string>
-  <string name="sample_text_view_text">This na sample text view</string>
-  <string name="FAQs">FAQs</string>
-  <string name="featured_questions">Featured Questions</string>
-  <string name="frequently_asked_questions">Frequently Asked Questions</string>
+  <string name="stop_exploration_dialog_cancel_button_text">Kansu-am</string>
+  <string name="stop_exploration_dialog_leave_button_text">Comot</string>
+  <string name="exploration_activity_exit_button_spotlight_hint">Use dis button take comot anytime. We go save your progress.</string>
+  <string name="exploration_activity_voiceover_icon_spotlight_hint">You go like make %s read for you? Click on dis button to try am.</string>
+  <string name="audio_fragment_voiceover_language_icon_spotlight_hint">Click here to change voiceover language.</string>
+  <string name="stop_exploration_dialog_progress_full_title">Ei don reach di highest storage capacity</string>
+  <string name="stop_exploration_dialog_progress_full_description">Di saved progress for di lesson %s go comot.</string>
+  <string name="stop_exploration_dialog_progress_full_continue_button">Continue</string>
+  <string name="stop_exploration_dialog_progress_full_without_saving_button">Comot without saving progress</string>
+  <string name="stop_exploration_dialog_progress_full_back_to_lesson_button">Back to di lesson</string>
+  <string name="topic_fragment_practice_master_skills_text">Cram dese skills</string>
+  <string name="topic_fragment_practice_skills_description">Choose skills wey you go like to practice.</string>
+  <string name="topic_fragment_practice_start_button">Start</string>
+  <string name="topic_fragment_info_tab_content_description">Things about di topic.</string>
+  <string name="topic_fragment_revision_tab_content_description">Revise di concepts you learn from di lessons wey you don complete here.</string>
+  <string name="topic_fragment_practice_tab_content_description">Practice di concepts wey you learn from lessons wey you don complete.</string>
+  <string name="topic_fragment_lessons_tab_content_description">Click here to start to play di lesson.</string>
+  <string name="topic_fragment_lessons_tab_spotlight_hint">Find all your lessons for here.</string>
+  <string name="topic_fragment_revision_tab_spotlight_hint">Revise concepts wey you learn from lessons wey you don complete here.</string>
+  <string name="topic_fragment_first_chapter_spotlight_hint">Click here to start to play a lesson.</string>
+  <string name="state_fragment_continue_button_text">Continue</string>
+  <string name="state_fragment_previous_state_button_description">Go di former card</string>
+  <string name="state_fragment_next_state_button_description">Go di next card</string>
+  <string name="state_fragment_submit_button_text">Submit</string>
+  <string name="state_fragment_replay_button_text">Replay</string>
+  <string name="state_fragment_return_to_topic_button_text">Return To Di Topic</string>
+  <string name="state_fragment_previous_responses_header">Former reply (%s)</string>
+  <string name="state_fragment_image_interaction_answer_text">Clicks on %s</string>
+  <string name="topic_fragment_info_see_more_text">See More</string>
+  <string name="topic_fragment_info_see_less_text">See Less</string>
+  <string name="spotlight_fragment_test_sample_view_text">This na sample text view</string>
+  <string name="faq_list_activity_title">FAQs</string>
+  <string name="faq_list_activity_item_header_text">Featured Questions</string>
   <string name="faq_activity_title">FAQs (Frequently Asked Questions)</string>
   <string name="pin_password_activity_title">PIN verification</string>
   <string name="onboarding_activity_title">Introduction</string>
-  <string name="frequently_asked_questions_FAQ">Frequently Asked Questions (FAQs)</string>
-  <string name="info">Info</string>
-  <string name="lessons">Lessons</string>
-  <string name="practice">Practice</string>
-  <string name="revision">Revision</string>
-  <string name="administrator_controls_title">Administrator Controls</string>
-  <string name="topic_page">Topic page</string>
-  <string name="topic_name">Topic: %s</string>
-  <string name="topic">Topic</string>
+  <string name="help_activity_faq_text">Frequently Asked Questions (FAQs)</string>
+  <string name="topic_fragment_info">Info</string>
+  <string name="topic_fragment_lessons">Lessons</string>
+  <string name="topic_fragment_practice">Practice</string>
+  <string name="topic_fragment_revision">Revision</string>
+  <string name="topic_activity_title">Topic page</string>
+  <string name="topic_fragment_name_text">Topic: %s</string>
   <string name="ongoing_topic_list_activity_title">Topics wey dey in Progress</string>
-  <string name="chapter_name">Chapter %s: %s</string>
-  <string name="chapter_completed">Chapter %s with title %s don complete</string>
-  <string name="chapter_in_progress">Chapter %s with title %s dey in progress</string>
-  <string name="chapter_prerequisite_title_label">Complete Chapter %s: %s to unlock dis chapter.</string>
-  <string name="chapter_locked_prerequisite_title_label">Chapter %s: %s dey locked currently. Abeg complete chapter %s: %s to fit unlock dis chapter.</string>
-  <string name="chapter_prerequisite_title_label_without_chapter_title">Finish the chapter wey dey before to fit open dis chapter</string>
-  <string name="text_input_default_content_description">Enter text.</string>
-  <string name="fractions_default_hint_text">Enter fraction wey dey in di form x/x, or mixed nomba wey dey in di form x x/x.</string>
-  <string name="fractions_default_hint_text_no_integer">Enter fraction wey dey in di form x/x.</string>
-  <string name="numeric_input_hint">Enter a nomba.</string>
-  <string name="number_with_units_input_hint_text">Write nombas with units for here.</string>
-  <string name="numeric_expression_default_hint_text">Use only nombas write an expression for here.</string>
-  <string name="algebraic_expression_default_hint_text">Write an expression for here.</string>
-  <string name="math_equation_default_hint_text">Write an equation for here.</string>
-  <string name="math_expression_error_spaces_in_numerical_input">Abeg remove di spaces between di nombas for your ansa.</string>
-  <string name="math_expression_error_unbalanced_parentheses">Abeg close or remove di bracket.</string>
-  <string name="math_expression_error_single_redundant_parentheses">Abeg remove di bracket wey dey around di whole ansa: \'%s\'.</string>
-  <string name="math_expression_error_multiple_redundant_parentheses">Abeg remove di extra bracket wey dey around di \'(%1$s)\', for example: \'%1$s\'.</string>
-  <string name="math_expression_error_redundant_parentheses_individual_term">Abeg remove di extra bracket wey dey around \'(%1$s)\', for example: \'%1$s\'.</string>
-  <string name="math_expression_error_unnecessary_symbols">Invalid \'%s\' dey for inside di ansa. Abeg remove am.</string>
-  <string name="math_expression_error_number_after_var_term">Abeg arrange di order of %1$s &amp; %2$s. For example: %2$s%1$s.</string>
-  <string name="math_expression_error_consecutive_binary_operators">%1$s and %2$s suppose dey separated by a nomba or a variable.</string>
-  <string name="math_expression_error_consecutive_unary_operators">Abeg remove di extra symbols for your ansa.</string>
-  <string name="math_expression_error_missing_lhs_for_addition_operator">Ei get a nomba or a variable wey dey miss before or afta di addition sign \'%1$s\'? If not, abeg remove di extra \'%1$s\'.</string>
-  <string name="math_expression_error_missing_lhs_for_multiplication_operator">Ei get a nomba or a variable wey dey miss before or afta di multiplication sign \'%1$s\'? If not, abeg remove di extra \'%1$s\'.</string>
-  <string name="math_expression_error_missing_lhs_for_division_operator">Ei get a nomba or a variable wey dey miss before or afta di division sign \'%1$s\'? If not, abeg remove di extra \'%1$s\'.</string>
-  <string name="math_expression_error_missing_lhs_for_exponentiation_operator">Ei get a nomba or a variable wey dey miss before or afta di exponentiation sign \'%1$s\'? If not, abeg remove di extra \'%1$s\'.</string>
-  <string name="math_expression_error_missing_rhs_for_addition_operator">Ei be like sey a nomba or a variable dey miss afta di addition sign \'%s\'.</string>
-  <string name="math_expression_error_missing_rhs_for_subtraction_operator">Ei be like sey a nomba or a variable dey miss afta di subtraction sign \'%s\'.</string>
-  <string name="math_expression_error_missing_rhs_for_multiplication_operator">Ei be like sey a nomba or a variable dey miss afta di multiplication sign \'%s\'.</string>
-  <string name="math_expression_error_missing_rhs_for_division_operator">Ei be like sey a nomba or a variable dey miss afta di division sign \'%s\'.</string>
-  <string name="math_expression_error_missing_rhs_for_exponentiation_operator">Ei be like sey a nomba or a variable dey miss afta di exponentiation sign \'%s\'.</string>
-  <string name="math_expression_error_exponent_has_variable">Sorry, di app no dey support variables in exponents. Abeg revise your ansa.</string>
-  <string name="math_expression_error_exponent_too_large">Sorry, di app no dey support powers wey dey higher dan 5. Abeg revise your ansa.</string>
-  <string name="math_expression_error_nested_exponent">Sorry, di app no dey support repeated powers/exponents. Abeg reduce your ansa to one power.</string>
-  <string name="math_expression_error_hanging_square_root">Input dey miss for square root.</string>
-  <string name="math_expression_error_term_divided_by_zero">Dividing by zero dey invalid. Abeg revise your ansa.</string>
-  <string name="math_expression_error_variable_in_numeric_expression">Ei be like sey you done enter some variables. Abeg make sure sey na only nombas dey your ansa and remove any variables from your ansa.</string>
-  <string name="math_expression_error_invalid_variable">Abeg use di variables wey dey di question and not %s.</string>
-  <string name="math_expression_error_missing_equals">Your equation dey miss an \'=\' sign.</string>
-  <string name="math_expression_error_more_than_one_equals">Your equation get too many \'=\' signs. Ei suppose get only one.</string>
-  <string name="math_expression_error_hanging_equals">One of di sides of \'=\' for your equation dey empty.</string>
-  <string name="math_expression_error_unsupported_function">Function \'%s\' no dey supported. Abeg revise your ansa.</string>
-  <string name="math_expression_error_incomplete_function_name">Na sqrt you mean? If not, abeg separate di variables with multiplication signs.</string>
-  <string name="math_expression_error_generic">Sorry, we no fit understand your ansa. Abeg check am to make sure any mistake no dey.</string>
-  <string name="enable_audio_playback_content_description">Enable audio voiceover for dis lesson.</string>
-  <string name="recently_played_stories">Stories wey you just play</string>
-  <string name="last_played_stories">Stori wey you play last</string>
-  <string name="view_all">View All</string>
-  <string name="ongoing_story_last_week">You play am last week</string>
-  <string name="ongoing_story_last_month">You play am last month</string>
+  <string name="topic_fragment_lessons_chapter_play_name_text">Chapter %s: %s</string>
+  <string name="topic_fragment_lessons_chapter_completed_text">Chapter %s with title %s don complete</string>
+  <string name="topic_fragment_lessons_chapter_in_progress_text">Chapter %s with title %s dey in progress</string>
+  <string name="topic_fragment_lessons_chapter_prerequisite_label">Complete Chapter %s: %s to unlock dis chapter.</string>
+  <string name="topic_fragment_lessons_chapter_locked_prerequisite_label">Complete Chapter %s: %s to unlock dis chapter.</string>
+  <string name="topic_fragment_lessons_without_chapter_prerequisite_label">Finish the chapter wey dey before to fit open dis chapter</string>
+  <string name="state_fragment_text_input_interaction_content_description">Enter text.</string>
+  <string name="state_fragment_fraction_input_interaction_hint">Enter fraction wey dey in di form x/x, or mixed nomba wey dey in di form x x/x.</string>
+  <string name="state_fragment_fraction_input_interaction_no_integer_hint">Enter fraction wey dey in di form x/x.</string>
+  <string name="state_fragment_numeric_input_interaction_hint">Enter a nomba.</string>
+  <string name="state_fragment_numeric_input_interaction_default_hint">Use only nombas write an expression for here.</string>
+  <string name="state_fragment_algebraic_input_interaction_default_hint">Write an expression for here.</string>
+  <string name="state_fragment_math_equation_default_hint">Write an equation for here.</string>
+  <string name="state_fragment_math_expression_space_error">Abeg remove di spaces between di nombas for your ansa.</string>
+  <string name="state_fragment_math_expression_unbalanced_parentheses_error">Abeg close or remove di bracket.</string>
+  <string name="state_fragment_math_expression_single_redundant_parentheses_error">Abeg remove di bracket wey dey around di whole ansa: \'%s\'.</string>
+  <string name="state_fragment_math_expression_multiple_redundant_parentheses_error">Abeg remove di extra bracket wey dey around di \'(%1$s)\', for example: \'%1$s\'.</string>
+  <string name="state_fragment_math_expression_individual_redundant_parentheses_error">Abeg remove di extra bracket wey dey around \'(%1$s)\', for example: \'%1$s\'.</string>
+  <string name="state_fragment_math_expression_unnecessary_symbols_error">Invalid \'%s\' dey for inside di ansa. Abeg remove am.</string>
+  <string name="state_fragment_math_expression_number_after_var_error">Abeg arrange di order of %1$s &amp; %2$s. For example: %2$s%1$s.</string>
+  <string name="state_fragment_math_expression_consecutive_binary_operators_error">%1$s and %2$s suppose dey separated by a nomba or a variable.</string>
+  <string name="state_fragment_math_expression_consecutive_unary_operators_error">Abeg remove di extra symbols for your ansa.</string>
+  <string name="state_fragment_math_expression_missing_lhs_for_addition_error">Ei get a nomba or a variable wey dey miss before or afta di addition sign \'%1$s\'? If not, abeg remove di extra \'%1$s\'.</string>
+  <string name="state_fragment_math_expression_missing_lhs_for_multiplication_error">Ei get a nomba or a variable wey dey miss before or afta di multiplication sign \'%1$s\'? If not, abeg remove di extra \'%1$s\'.</string>
+  <string name="state_fragment_math_expression_missing_lhs_for_division_error">Ei get a nomba or a variable wey dey miss before or afta di division sign \'%1$s\'? If not, abeg remove di extra \'%1$s\'.</string>
+  <string name="state_fragment_math_expression_missing_lhs_for_exponentiation_error">Ei get a nomba or a variable wey dey miss before or afta di exponentiation sign \'%1$s\'? If not, abeg remove di extra \'%1$s\'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_addition_error">Ei be like sey a nomba or a variable dey miss afta di addition sign \'%s\'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_subtraction_error">Ei be like sey a nomba or a variable dey miss afta di subtraction sign \'%s\'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_multiplication_error">Ei be like sey a nomba or a variable dey miss afta di multiplication sign \'%s\'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_division_error">Ei be like sey a nomba or a variable dey miss afta di division sign \'%s\'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_exponentiation_error">Ei be like sey a nomba or a variable dey miss afta di exponentiation sign \'%s\'.</string>
+  <string name="state_fragment_math_expression_exponent_has_variable_error">Sorry, di app no dey support variables in exponents. Abeg revise your ansa.</string>
+  <string name="state_fragment_math_expression_exponent_too_large_error">Sorry, di app no dey support powers wey dey higher dan 5. Abeg revise your ansa.</string>
+  <string name="state_fragment_math_expression_nested_exponent_error">Sorry, di app no dey support repeated powers/exponents. Abeg reduce your ansa to one power.</string>
+  <string name="state_fragment_math_expression_hanging_square_root_error">Input dey miss for square root.</string>
+  <string name="state_fragment_math_expression_divided_by_zero_error">Dividing by zero dey invalid. Abeg revise your ansa.</string>
+  <string name="state_fragment_math_expression_variable_in_numeric_error">Ei be like sey you done enter some variables. Abeg make sure sey na only nombas dey your ansa and remove any variables from your ansa.</string>
+  <string name="state_fragment_math_expression_invalid_variable_error">Abeg use di variables wey dey di question and not %s.</string>
+  <string name="state_fragment_math_expression_missing_equals_error">Your equation dey miss an \'=\' sign.</string>
+  <string name="state_fragment_math_expression_more_than_one_equals_error">Your equation get too many \'=\' signs. Ei suppose get only one.</string>
+  <string name="state_fragment_math_expression_hanging_equals_error">One of di sides of \'=\' for your equation dey empty.</string>
+  <string name="state_fragment_math_expression_unsupported_function_error">Function \'%s\' no dey supported. Abeg revise your ansa.</string>
+  <string name="state_fragment_math_expression_incomplete_function_name_error">Na sqrt you mean? If not, abeg separate di variables with multiplication signs.</string>
+  <string name="state_fragment_math_expression_generic_error">Sorry, we no fit understand your ansa. Abeg check am to make sure any mistake no dey.</string>
+  <string name="home_activity_recently_played_stories">Stories wey you just play</string>
+  <string name="home_activity_last_played_stories">Stori wey you play last</string>
+  <string name="home_activity_view_all_text">View All</string>
+  <string name="home_activity_ongoing_story_last_week">You play am last week</string>
+  <string name="home_activity_ongoing_story_last_month">You play am last month</string>
   <string name="story_activity_title">Chapter List</string>
-  <string name="lesson_thumbnail_content_description">Picture for %s</string>
-  <string name="stories_you_can_play">Stories Wey You Fit Play</string>
-  <string name="navigate_up">Go up</string>
-  <string name="recently_played_activity">Stories wey you just play</string>
-  <string name="topic_downloaded">Topic Wey You Don Download</string>
-  <string name="downloaded">You don download am</string>
-  <string name="question_player_title">Practice Mode</string>
-  <string name="question_training_session_progress">Question %s of %s</string>
-  <string name="question_training_session_progress_finished">Complete</string>
-  <string name="question_training_session_finished_header">Finished</string>
-  <string name="question_training_session_finished_message">You don finish all of di questions! You fit choose to play anoda set of questions, or go back to di topic.</string>
-  <string name="status_in_progress">In Progress</string>
-  <string name="status_completed">Completed</string>
-  <string name="show_chapter_list">Show di chapter list</string>
-  <string name="hide_chapter_list">Hide di chapter list</string>
-  <string name="play_pause_audio">Play/Pause Audio</string>
-  <string name="preferences">How you like am</string>
+  <string name="home_activity_lesson_thumbnail_description">Picture for %s</string>
+  <string name="home_activity_topic_play_text">Stories Wey You Fit Play</string>
+  <string name="navigate_up_text">Go up</string>
+  <string name="recently_played_activity_title">Stories wey you just play</string>
+  <string name="topic_fragment_info_topic_downloaded">Topic Wey You Don Download</string>
+  <string name="exploration_activity_question_player_title">Practice Mode</string>
+  <string name="topic_fragment_question_training_session_progress">Question %s of %s</string>
+  <string name="topic_fragment_question_training_session_progress_finished">Complete</string>
+  <string name="topic_fragment_question_end_session_header_text">Finished</string>
+  <string name="topic_fragment_question_end_session_body_text">You don finish all of di questions! You fit choose to play anoda set of questions, or go back to di topic.</string>
+  <string name="topic_fragment_lessons_story_status_in_progress">In Progress</string>
+  <string name="topic_fragment_lessons_story_status_completed">Completed</string>
+  <string name="topic_fragment_lessons_show_chapter_list">Show di chapter list</string>
+  <string name="topic_fragment_lessons_hide_chapter_list">Hide di chapter list</string>
   <string name="profile_progress_activity_title">Profile Progress Page</string>
-  <string name="search">Find-am</string>
   <string name="fraction_error_invalid_chars">Abeg only use numerical digits, spaces or forward slashes (/)</string>
   <string name="fraction_error_invalid_format">Abeg enter a valid fraction (e.g., 5/3 or 1 2/3)</string>
   <string name="fraction_error_divide_by_zero">Abeg no put 0 for di denominator</string>
@@ -183,7 +168,6 @@
   <string name="size_mb">%s MB</string>
   <string name="size_gb">%s GB</string>
   <string name="correct">You get am!</string>
-  <string name="topic_prefix">Topic: %s</string>
   <plurals name="chapter_count">
     <item quantity="one">1 Chapter</item>
     <item quantity="other">%s Chapters</item>
@@ -210,222 +194,211 @@
     <item quantity="zero">%s Topics in Progress</item>
     <item quantity="other">%s Topics in Progress</item>
   </plurals>
-  <string name="profile_chooser_activity_label">Page to select profile</string>
-  <string name="profile_chooser_admin">Administrator</string>
-  <string name="profile_chooser_select">Select your profile</string>
-  <string name="profile_chooser_add">Add Profile</string>
-  <string name="set_up_multiple_profiles">Set up Plenty Profiles</string>
-  <string name="set_up_multiple_profiles_description">Add up to 10 users to your account. Perfect for families and classrooms.</string>
-  <string name="profile_chooser_administrator_controls">Administrator Controls</string>
-  <string name="profile_chooser_language">Language</string>
-  <string name="admin_auth_toolbar">Administrator Controls</string>
+  <string name="profile_chooser_activity_title">Page to select profile</string>
+  <string name="profile_chooser_fragment_admin_text">Administrator</string>
+  <string name="profile_chooser_fragment_select_text">Select your profile</string>
+  <string name="profile_chooser_fragment_add_text">Add Profile</string>
+  <string name="profile_chooser_fragment_set_up_multiple_profiles">Set up Plenty Profiles</string>
+  <string name="profile_chooser_fragment_add_profile_description_text">Add up to 10 users to your account. Perfect for families and classrooms.</string>
+  <string name="profile_chooser_fragment_administrator_controls_text">Administrator Controls</string>
+  <string name="profile_chooser_fragment_language_text">Language</string>
+  <string name="admin_auth_activity_title">Administrator Controls</string>
   <string name="admin_auth_activity_add_profiles_title">Authorise to add profiles</string>
   <string name="admin_auth_activity_access_controls_title">Authorise to access Administrator Controls</string>
-  <string name="admin_auth_heading">Administrator Authorization Required</string>
-  <string name="admin_auth_sub">Enter di Administrator PIN in order to create a new account.</string>
-  <string name="admin_auth_admin_controls_sub">Enter di Administrator PIN in order to access Administrator Controls.</string>
-  <string name="admin_auth_pin">Administrator\'s PIN</string>
-  <string name="admin_auth_incorrect">Administrator PIN no correct. Abeg try again.</string>
-  <string name="admin_auth_null">Abeg enter Administrator PIN.</string>
-  <string name="admin_auth_submit">Submit</string>
-  <string name="admin_auth_close">Close</string>
-  <string name="admin_pin_requirement_description">Before we add profiles, we need to protect your account by creating a PIN. Dis wan go give you di ability to authorize manage profiles for di device.</string>
-  <string name="admin_pin_pin_description">You fit use PIN wey you don set for personal accounts like banking or social security.</string>
-  <string name="admin_pin_new_pin">New 5-Digit PIN</string>
-  <string name="admin_pin_new_confirm">Confirm 5-Digit PIN</string>
-  <string name="admin_pin_error_pin_length">Your PIN suppose be 5 digits long.</string>
-  <string name="admin_pin_error_pin_confirm_wrong">Abeg make sure sey di two PINs match.</string>
-  <string name="save">Save</string>
+  <string name="admin_auth_activity_heading_text">Administrator Authorization Required</string>
+  <string name="admin_auth_activity_subheading_text">Enter di Administrator PIN in order to create a new account.</string>
+  <string name="admin_auth_activity_controls_subheading_text">Enter di Administrator PIN in order to access Administrator Controls.</string>
+  <string name="admin_auth_activity_input_pin_hint_text">Administrator\'s PIN</string>
+  <string name="admin_auth_activity_incorrect_pin_label">Administrator PIN no correct. Abeg try again.</string>
+  <string name="admin_auth_activity_null_pin_input_label">Abeg enter Administrator PIN.</string>
+  <string name="admin_auth_activity_submit_button_text">Submit</string>
+  <string name="admin_auth_activity_tool_bar_content_desc">Close</string>
+  <string name="admin_pin_activity_requirement_description_text">Before we add profiles, we need to protect your account by creating a PIN. Dis wan go give you di ability to authorize manage profiles for di device.</string>
+  <string name="admin_pin_activity_warning_text">You fit use PIN wey you don set for personal accounts like banking or social security.</string>
+  <string name="admin_pin_activity_input_new_pin_hint">New 5-Digit PIN</string>
+  <string name="admin_pin_activity_input_confirm_pin_hint">Confirm 5-Digit PIN</string>
+  <string name="admin_pin_activity_pin_length_error">Your PIN suppose be 5 digits long.</string>
+  <string name="admin_pin_activity_wrong_pin_text">Abeg make sure sey di two PINs match.</string>
+  <string name="admin_pin_activity_submit_button_text">Save</string>
   <string name="admin_pin_activity_title">Authorise to add profiles</string>
-  <string name="add_profile_activity_label">Add Profile</string>
-  <string name="add_profile_title">Add Profile</string>
-  <string name="add_profile_input_name">Name</string>
-  <string name="add_profile_input_pin">3-Digit PIN</string>
-  <string name="add_profile_input_confirm_pin">Confirm 3-Digit PIN</string>
-  <string name="add_profile_allow_download_heading">Allow Download Access</string>
-  <string name="add_profile_allow_download_sub">User go dey able to download and delete content without Administrator PIN.</string>
-  <string name="add_profile_create_btn">Create</string>
-  <string name="add_profile_close">Close</string>
-  <string name="add_profile_pin_info">With a PIN, nobody else go fit access a profile besides dis assigned user.</string>
-  <string name="add_profile_error_image_failed_store">We fail to save your avatar image. Abeg try again.</string>
-  <string name="add_profile_error_name_not_unique">Anoda profile don already dey use dis name.</string>
-  <string name="add_profile_error_name_empty">Abeg put valid name for dis profile.</string>
-  <string name="add_profile_error_name_only_letters">Abeg choose profile name wey no get nombas or symbols.</string>
-  <string name="add_profile_error_pin_length">Your PIN suppose dey 3 digits long.</string>
-  <string name="add_profile_error_pin_confirm_wrong">Abeg make sure sey di two PINs match.</string>
-  <string name="add_profile_info_content_description">More information on 3-digit PINs.</string>
-  <string name="current_profile_picture_content_description">Current profile picture</string>
-  <string name="edit_profile_picture_content_description">Edit profile picture</string>
-  <string name="onboarding_slide_0_title">Welcome to %s!</string>
-  <string name="onboarding_slide_0_description">Learn anything wey you want in an effective and enjoyable way.</string>
-  <string name="onboarding_slide_1_title">Add users to your account.</string>
-  <string name="onboarding_slide_1_description">Share di experience and create up to 10 profiles.</string>
-  <string name="onboarding_slide_2_title">Download for offline.</string>
-  <string name="onboarding_slide_2_description">Continue to learn your lessons without internet connection.</string>
-  <string name="onboarding_slide_3_title">Have fun!</string>
-  <string name="onboarding_slide_3_description">Enjoy your learning adventures with our free, effective lessons.</string>
-  <string name="skip">Skip</string>
-  <string name="next_arrow">Next</string>
-  <string name="get_started">Get Started</string>
-  <string name="onboarding_slide_dots_content_description">Slide %s of %s</string>
-  <string name="pin_password_hello">Hi, %s!</string>
-  <string name="pin_password_admin_enter">Abeg put your Administrator PIN.</string>
-  <string name="pin_password_user_enter">Abeg put your PIN.</string>
-  <string name="input_pin_password_as_admin">Administrator’s 5-Digit PIN.</string>
-  <string name="input_pin_password_as_user">User’s 3-Digit PIN.</string>
-  <string name="pin_password_forgot_pin">You don forget your PIN?</string>
-  <string name="pin_password_incorrect_pin">Di PIN no correct.</string>
-  <string name="pin_password_show">show</string>
-  <string name="pin_password_hide">hide am</string>
-  <string name="pin_password_close">Close</string>
-  <string name="pin_password_success">PIN change is successful</string>
-  <string name="pin_password_forgot_title">You don forget your PIN?</string>
-  <string name="admin_forgot_pin_message">To reset your PIN, you go need to clear all di data wey don save for %s.\n\nRememba sey dis action go make all profiles and user progress delete, and you no fit undo am. Also, di app go close wen ei don complete and you go need need to reopen am.</string>
-  <string name="admin_forgot_pin_reset_app_data_button_text">Reset %s Data</string>
-  <string name="admin_confirm_app_wipe_title">Confirm %s Data Reset</string>
-  <string name="admin_confirm_app_wipe_message">You dey sure sey you wan delete all %s profiles for dis device? You no fit undo dis operation.</string>
-  <string name="admin_confirm_app_wipe_positive_button_text">Yes</string>
-  <string name="admin_confirm_app_wipe_negative_button_text">No</string>
-  <string name="show_hide_password_icon">Show/Hide password icon</string>
-  <string name="password_shown_icon">Password shown icon</string>
-  <string name="password_hidden_icon">Password hidden icon</string>
-  <string name="enter_your_pin">Put your PIN</string>
-  <string name="pin_password_toolbar_title">Put PIN</string>
-  <string name="admin_settings_label">Administrator\'s PIN</string>
-  <string name="admin_settings_heading">Access to Administrator Settings</string>
-  <string name="admin_settings_sub">You need administrator\'s PIN to change user\'s PIN</string>
-  <string name="admin_settings_cancel">Cancel</string>
-  <string name="admin_settings_submit">Submit</string>
-  <string name="admin_settings_incorrect">Administrator PIN no correct. Abeg try again.</string>
-  <string name="admin_settings_enter_user_new_pin">%1$s\'s New PIN.</string>
-  <string name="reset_pin_enter">Put a New Pin</string>
-  <string name="reset_pin_enter_dialog_message">Dis PIN go be %s\'s new PIN and ei go need am wen signing in.</string>
+  <string name="add_profile_activity_title">Add Profile</string>
+  <string name="add_profile_activity_input_name_hint">Name</string>
+  <string name="add_profile_activity_input_pin_hint">3-Digit PIN</string>
+  <string name="add_profile_activity_input_confirm_pin_hint">Confirm 3-Digit PIN</string>
+  <string name="add_profile_activity_allow_download_text">Allow Download Access</string>
+  <string name="add_profile_activity_allow_download_sub_text">User go dey able to download and delete content without Administrator PIN.</string>
+  <string name="add_profile_activity_create_button_text">Create</string>
+  <string name="add_profile_activity_close_dialog_text">Close</string>
+  <string name="add_profile_activity_pin_info_dialog_text">With a PIN, nobody else go fit access a profile besides dis assigned user.</string>
+  <string name="add_profile_activity_name_not_unique_error_text">Anoda profile don already dey use dis name.</string>
+  <string name="add_profile_activity_name_empty_error_text">Abeg put valid name for dis profile.</string>
+  <string name="add_profile_activity_name_only_letters_error_text">Abeg choose profile name wey no get nombas or symbols.</string>
+  <string name="add_profile_activity_pin_length_error_text">Your PIN suppose dey 3 digits long.</string>
+  <string name="add_profile_activity_wrong_confirm_pin_error_text">Abeg make sure sey di two PINs match.</string>
+  <string name="add_profile_activity_info_image_content_description">More information on 3-digit PINs.</string>
+  <string name="add_profile_activity_edit_image_content_description">Current profile picture</string>
+  <string name="add_profile_activity_edit_user_image_content_description">Edit profile picture</string>
+  <string name="onboarding_activity_slide_0_title">Welcome to %s!</string>
+  <string name="onboarding_activity_slide_0_description">Learn anything wey you want in an effective and enjoyable way.</string>
+  <string name="onboarding_activity_slide_1_title">Add users to your account.</string>
+  <string name="onboarding_activity_slide_1_description">Share di experience and create up to 10 profiles.</string>
+  <string name="onboarding_activity_slide_2_title">Download for offline.</string>
+  <string name="onboarding_activity_slide_2_description">Continue to learn your lessons without internet connection.</string>
+  <string name="onboarding_activity_slide_3_title">Have fun!</string>
+  <string name="onboarding_activity_slide_3_description">Enjoy your learning adventures with our free, effective lessons.</string>
+  <string name="onboarding_activity_skip_text">Skip</string>
+  <string name="onboarding_activity_next_arrow_text">Next</string>
+  <string name="onboarding_activity_get_started_text">Get Started</string>
+  <string name="onboarding_activity_slide_dots_content_description">Slide %s of %s</string>
+  <string name="pin_password_activity_hello_text">Hi, %s!</string>
+  <string name="pin_password_activity_enter_text">Abeg put your Administrator PIN.</string>
+  <string name="pin_password_activity_user_enter_text">Abeg put your PIN.</string>
+  <string name="pin_password_activity_admin_input_pin_text">Administrator’s 5-Digit PIN.</string>
+  <string name="pin_password_activity_user_input_pin_text">User’s 3-Digit PIN.</string>
+  <string name="pin_password_activity_forgot_pin_text">You don forget your PIN?</string>
+  <string name="pin_password_activity_incorrect_pin_error">Di PIN no correct.</string>
+  <string name="pin_password_activity_show_pin_text">show</string>
+  <string name="pin_password_activity_hide_pin_text">hide am</string>
+  <string name="pin_password_activity_close_text">Close</string>
+  <string name="pin_password_activity_success_text">PIN change is successful</string>
+  <string name="pin_password_activity_dialog_forgot_title">You don forget your PIN?</string>
+  <string name="pin_password_activity_dialog_forgot_message">To reset your PIN, you go need to clear all di data wey don save for %s.\n\nRememba sey dis action go make all profiles and user progress delete, and you no fit undo am. Also, di app go close wen ei don complete and you go need need to reopen am.</string>
+  <string name="pin_password_activity_reset_app_data_button_text">Reset %s Data</string>
+  <string name="pin_password_activity_reset_dialog_title">Confirm %s Data Reset</string>
+  <string name="pin_password_activity_reset_dialog_message">You dey sure sey you wan delete all %s profiles for dis device? You no fit undo dis operation.</string>
+  <string name="pin_password_activity_reset_dialog_postive_button_text">Yes</string>
+  <string name="pin_password_activity_reset_dialog_negative_button_text">No</string>
+  <string name="pin_password_activity_shown_icon_content_description">Password shown icon</string>
+  <string name="pin_password_activity_hidden_icon_content_description">Password hidden icon</string>
+  <string name="pin_password_activity_toolbar_title">Put PIN</string>
+  <string name="admin_settings_dialog_input_pin_hint">Administrator\'s PIN</string>
+  <string name="admin_settings_dialog_heading">Access to Administrator Settings</string>
+  <string name="admin_settings_dialog_message_text">You need administrator\'s PIN to change user\'s PIN</string>
+  <string name="admin_settings_dialog_cancel_button_text">Cancel</string>
+  <string name="admin_settings_dialog_submit_button_text">Submit</string>
+  <string name="admin_settings_dialog_incorrect_pin_error_text">Administrator PIN no correct. Abeg try again.</string>
+  <string name="admin_settings_dialog_new_pin_text">%1$s\'s New PIN.</string>
+  <string name="pin_password_activity_reset_pin_dialog_title">Put a New Pin</string>
+  <string name="pin_password_activity_reset_pin_dialog_message">Dis PIN go be %s\'s new PIN and ei go need am wen signing in.</string>
   <string name="my_downloads_activity_title">My Downloads</string>
-  <string name="tab_downloads">Downloads</string>
-  <string name="tab_updates">Updates (2)</string>
+  <string name="my_downloads_fragment_tab_download_text">Downloads</string>
+  <string name="my_downloads_fragment_tab_updates_text">Updates (2)</string>
   <string name="home_activity_back_dialog_message">You go like to exit your profile?</string>
-  <string name="home_activity_back_dialog_cancel">Cancel</string>
-  <string name="home_activity_back_dialog_exit">Exit</string>
+  <string name="home_activity_back_dialog_cancel_button">Cancel</string>
+  <string name="home_activity_back_dialog_exit_button">Exit</string>
   <string name="home_activity_title">Home</string>
-  <string name="promoted_story_spotlight_hint">From now, you go see lessons recommended for you here.</string>
-  <string name="select_a_topic_to_start">Select a Topic to Start</string>
+  <string name="home_story_promoted_story_spotlight_hint">From now, you go see lessons recommended for you here.</string>
+  <string name="home_activity_all_topics_text">Select a Topic to Start</string>
   <string name="profile_list_activity_title">Profiles</string>
   <string name="profile_edit_activity_title">Edit Profile</string>
-  <string name="profile_edit_created">Created on %s</string>
-  <string name="profile_last_used">Last used</string>
-  <string name="profile_edit_rename">Rename</string>
-  <string name="profile_edit_reset">Reset PIN</string>
-  <string name="profile_edit_mark_chapter_completion">Mark Chapters Completed</string>
-  <string name="profile_edit_enable_quick_lesson_language_switching_label">Enable Quick Language Switching</string>
-  <string name="profile_edit_enable_quick_lesson_language_switching_explanation">Allow dis user to quickly switch between English and Swahili within a lesson.</string>
-  <string name="profile_edit_delete">Profile Deletion</string>
-  <string name="profile_edit_delete_dialog_title">Permanently delete dis profile?</string>
-  <string name="profile_edit_delete_dialog_message">All progress go delete and you no fit get am back.</string>
-  <string name="profile_edit_delete_dialog_positive">Delete</string>
-  <string name="profile_edit_delete_dialog_negative">Cancel</string>
-  <string name="profile_edit_allow_download_heading">Allow Download Access</string>
-  <string name="profile_edit_allow_download_sub">Di user no fit download and delete content without Administrator password</string>
+  <string name="profile_edit_activity_created_text">Created on %s</string>
+  <string name="profile_edit_activity_last_used_text">Last used</string>
+  <string name="profile_edit_activity_rename_text">Rename</string>
+  <string name="profile_edit_activity_reset_text">Reset PIN</string>
+  <string name="profile_edit_activity_mark_chapters_for_completion_button_text">Mark Chapters Completed</string>
+  <string name="profile_edit_activity_switching_header_text">Enable Quick Language Switching</string>
+  <string name="profile_edit_activity_switching_label_text">Allow dis user to quickly switch between English and Swahili within a lesson.</string>
+  <string name="profile_edit_activity_delete_button_text">Profile Deletion</string>
+  <string name="profile_edit_activity_dialog_title">Permanently delete dis profile?</string>
+  <string name="profile_edit_activity_dialog_message">All progress go delete and you no fit get am back.</string>
+  <string name="profile_edit_activity_dialog_positive_button">Delete</string>
+  <string name="profile_edit_activity_dialog_negative_button">Cancel</string>
+  <string name="profile_edit_activity_allow_download_heading">Allow Download Access</string>
+  <string name="profile_edit_activity_allow_download_sub">Di user no fit download and delete content without Administrator password</string>
   <string name="profile_picture_activity_title">Profile Picture</string>
-  <string name="profile_progress_edit_dialog_title">Profile Picture</string>
-  <string name="profile_picture_edit_alert_dialog_cancel_button">Cancel</string>
-  <string name="profile_picture_edit_alert_dialog_view_profile_picture">View Profile Picture</string>
-  <string name="profile_picture_edit_alert_dialog_choose_from_library">Choose From Library</string>
+  <string name="profile_picture_edit_dialog_title">Profile Picture</string>
+  <string name="profile_picture_edit_dialog_cancel_button_text">Cancel</string>
+  <string name="profile_picture_edit_dialog_view_picture_text">View Profile Picture</string>
+  <string name="profile_picture_edit_dialog_change_picture_text">Choose From Library</string>
   <string name="profile_rename_activity_title">Rename Profile</string>
-  <string name="profile_rename_label">New Name</string>
-  <string name="profile_rename_save">Save</string>
+  <string name="profile_rename_activity_rename_input_hint">New Name</string>
+  <string name="profile_rename_activity_rename_save_button">Save</string>
   <string name="profile_reset_pin_activity_title">Reset PIN</string>
-  <string name="profile_reset_pin_main">Put new PIN for di user to put wan dey wan enter deir profile.</string>
-  <string name="profile_reset_pin_user_pin_label">3-Digit PIN</string>
-  <string name="profile_reset_pin_admin_pin_label">5-Digit PIN</string>
-  <string name="profile_reset_pin_user_confirm_label">Confirm 3-Digit PIN</string>
-  <string name="profile_reset_pin_admin_confirm_label">Confirm 5-Digit PIN</string>
-  <string name="profile_reset_pin_error_user_pin_length">Your PIN suppose dey 3 digits long.</string>
-  <string name="profile_reset_pin_error_admin_pin_length">Your PIN suppose dey 5 digits long.</string>
-  <string name="add_profile_create_a_3_digit_pin">Create a 3-Digit PIN</string>
-  <string name="add_profile_required">Required</string>
-  <string name="back_button">Back Button</string>
-  <string name="next">Next</string>
-  <string name="learner_analytics_label_text">Learner Study Analytics</string>
-  <string name="administrator_controls_general_label">General</string>
-  <string name="administrator_controls_edit_account">Edit account</string>
-  <string name="administrator_controls_profile_management_label">Profile Management</string>
-  <string name="administrator_controls_edit_profiles">Edit profiles</string>
-  <string name="administrator_controls_download_permissions_label">Download Permissions</string>
-  <string name="administrator_controls_update_on_wifi_title">Download and update only on Wi-fi</string>
-  <string name="administrator_controls_update_on_wifi_message">Topics go dey downloaded and updated only on Wi-fi. Any downloads or updates of cellular data go dey queue.</string>
-  <string name="administrator_controls_auto_update_title">Automatically update topics</string>
-  <string name="administrator_controls_auto_update_message">Downloaded topics wey get new content available go automatically update.</string>
-  <string name="administrator_controls_app_information_label">App Information</string>
-  <string name="administrator_controls_app_version">App Version</string>
-  <string name="administrator_controls_account_actions_label">Account Actions</string>
-  <string name="administrator_controls_log_out">Log Out</string>
-  <string name="log_out_dialog_cancel_button">Cancel</string>
-  <string name="log_out_dialog_okay_button">Ok</string>
-  <string name="log_out_dialog_message">You dey sure sey you wan log out of your profile?</string>
-  <string name="app_version_name">App Version %s</string>
-  <string name="app_last_update_date">Di last update install on %s. Use di version nomba for up to send feedback about bugs.</string>
+  <string name="profile_reset_pin_fragment_reset_pin_main_text">Put new PIN for di user to put wan dey wan enter deir profile.</string>
+  <string name="profile_reset_pin_fragment_user_pin_text">3-Digit PIN</string>
+  <string name="profile_reset_pin_fragment_admin_pin_text">5-Digit PIN</string>
+  <string name="profile_reset_pin_fragment_user_confirm_text">Confirm 3-Digit PIN</string>
+  <string name="profile_reset_pin_fragment_admin_confirm_text">Confirm 5-Digit PIN</string>
+  <string name="profile_reset_pin_fragment_error_user_pin_length">Your PIN suppose dey 3 digits long.</string>
+  <string name="profile_reset_pin_fragment_error_admin_pin_length">Your PIN suppose dey 5 digits long.</string>
+  <string name="add_profile_activity_pin_check_box_text">Create a 3-Digit PIN</string>
+  <string name="add_profile_activity_user_name_helper_text">Required</string>
+  <string name="walkthrough_activity_back_button_text">Back Button</string>
+  <string name="next_text">Next</string>
+  <string name="administrator_controls_activity_learner_analytics_text">Learner Study Analytics</string>
+  <string name="administrator_controls_fragment_general_label">General</string>
+  <string name="administrator_controls_fragment_edit_account_text">Edit account</string>
+  <string name="administrator_controls_fragment_profile_management_label">Profile Management</string>
+  <string name="administrator_controls_fragment_edit_profiles_text">Edit profiles</string>
+  <string name="administrator_controls_fragment_download_permissions_label">Download Permissions</string>
+  <string name="administrator_controls_fragment_topic_update_on_wifi_text">Download and update only on Wi-fi</string>
+  <string name="administrator_controls_fragment_topic_update_on_wifi_description">Topics go dey downloaded and updated only on Wi-fi. Any downloads or updates of cellular data go dey queue.</string>
+  <string name="administrator_controls_fragment_auto_update_topic_text">Automatically update topics</string>
+  <string name="administrator_controls_fragment_auto_update_topic_description">Downloaded topics wey get new content available go automatically update.</string>
+  <string name="administrator_controls_fragment_app_information_text">App Information</string>
+  <string name="administrator_controls_fragment_app_version_text">App Version</string>
+  <string name="administrator_controls_fragment_account_actions_text">Account Actions</string>
+  <string name="administrator_controls_fragment_log_out_text">Log Out</string>
+  <string name="log_out_dialog_cancel_button_text">Cancel</string>
+  <string name="log_out_dialog_okay_button_text">Ok</string>
+  <string name="log_out_dialog_message_text">You dey sure sey you wan log out of your profile?</string>
+  <string name="app_version_fragment_version_name_text">App Version %s</string>
+  <string name="app_version_fragment_last_update_date_text">Di last update install on %s. Use di version nomba for up to send feedback about bugs.</string>
   <string name="app_version_activity_title">App Version</string>
   <string name="app_language_activity_title">App Language</string>
   <string name="audio_language_activity_title">Preferred Audio Language</string>
   <string name="reading_text_size_activity_title">Reading Text Size</string>
-  <string name="title_reading_text_size">Reading Text Size</string>
-  <string name="story_text_will_look_like_this">Story text go look like dis.</string>
-  <string name="constant_string_for_text_size">A</string>
-  <string name="audio_language">Preferred Audio Language</string>
-  <string name="app_language">App Language</string>
-  <string name="reading_text_size">Reading Text Size</string>
-  <string name="reading_text_size_small">Small</string>
-  <string name="reading_text_size_medium">Medium</string>
-  <string name="reading_text_size_large">Large</string>
-  <string name="reading_text_size_extra_large">Extra Large</string>
-  <string name="slide_seekbar_to_control_text_size">Slide seekbar to control di text size.</string>
-  <string name="profile">Profile</string>
-  <string name="story_count_text_view">2 Stories</string>
-  <string name="topics_in_progress">Topics in Progress</string>
-  <string name="topic_in_progress">Topic in Progress</string>
-  <string name="stories_completed">Stories Completed</string>
-  <string name="story_completed">Story Completed</string>
+  <string name="option_activity_audio_language_text">Preferred Audio Language</string>
+  <string name="option_activity_app_language_text">App Language</string>
+  <string name="option_activity_reading_text_size">Reading Text Size</string>
+  <string name="option_activity_reading_text_size_small">Small</string>
+  <string name="option_activity_reading_text_size_medium">Medium</string>
+  <string name="option_activity_reading_text_size_large">Large</string>
+  <string name="option_activity_reading_text_size_extra_large">Extra Large</string>
+  <string name="profile_progress_activity_profile_title">Profile</string>
+  <string name="profile_progress_activity_topics_in_progress_text">Topics in Progress</string>
+  <string name="profile_progress_activity_topic_in_progress_text">Topic in Progress</string>
+  <string name="profile_progress_activity_stories_completed_text">Stories Completed</string>
+  <string name="profile_progress_activity_story_completed_text">Story Completed</string>
   <string name="options_activity_title">Options</string>
   <string name="completed_story_list_activity_title">Stories Completed</string>
   <string name="walkthrough_activity_title">App walkthrough</string>
-  <string name="walkthrough_welcome_description">Learn new math skills with stories wey go show you how to use dem for your daily life</string>
-  <string name="welcome">\"Welcome %s!\"</string>
-  <string name="what_do_you_want_to_learn">Wetin you wan learn?</string>
-  <string name="great">Great</string>
-  <string name="lets_get_started">Make we start.</string>
-  <string name="yes">Yes</string>
-  <string name="no">No…</string>
-  <string name="pick_a_different_topic">Pick a \ndifferent topic.</string>
-  <string name="are_you_interested">You dey interested in:\n%s?</string>
-  <string name="new_hint_available">New hint dey</string>
-  <string name="no_new_hint_available">No new hint dey</string>
-  <string name="show_hints_and_solution">Show hints and solution</string>
-  <string name="hint_list_item_number">Hint %s</string>
-  <string name="hints_and_solution_close_icon_description">Close</string>
-  <string name="hints_toolbar_title">Hints</string>
-  <string name="show_solution">Show solution</string>
-  <string name="reveal_solution">Show Solution</string>
-  <string name="hint_list_solution_title">Solution</string>
-  <string name="reveal_hint">Show Hint</string>
-  <string name="hide_hint">Hide Hint</string>
-  <string name="hide_solution">Hide solution</string>
-  <string name="hints_list_exclusive_solution_text">Di only solution na: %s</string>
-  <string name="hints_list_possible_solution_text">One solution na: %s</string>
-  <string name="this_will_reveal_the_solution">Dis go show di solution. You dey sure?</string>
-  <string name="reveal">Show</string>
+  <string name="walkthrough_activity_welcome_description">Learn new math skills with stories wey go show you how to use dem for your daily life</string>
+  <string name="walkthrough_activity_welcome_text">\"Welcome %s!\"</string>
+  <string name="walkthrough_activity_topic_header_text">Wetin you wan learn?</string>
+  <string name="walkthrough_activity_final_title_text">Great</string>
+  <string name="walkthrough_activity_get_started_text">Make we start.</string>
+  <string name="walkthrough_activity_yes_text">Yes</string>
+  <string name="walkthrough_activity_no_text">No…</string>
+  <string name="walkthrough_activity_pick_different_topic_text">Pick a \ndifferent topic.</string>
+  <string name="walkthrough_activity_are_you_interested_text">You dey interested in:\n%s?</string>
+  <string name="question_player_activity_new_hint_available_text">New hint dey</string>
+  <string name="state_fragment_hint_bulb_content_description">No new hint dey</string>
+  <string name="state_fragment_open_hint_content_description">Show hints and solution</string>
+  <string name="hint_solution_dialog_hint_list_item_number">Hint %s</string>
+  <string name="hint_solution_dialog_close_icon_description">Close</string>
+  <string name="state_fragment_hint_bar_title">Hints</string>
+  <string name="hint_solution_dialog_show_solution_text">Show solution</string>
+  <string name="hint_solution_dialog_reveal_solution_text">Show Solution</string>
+  <string name="hint_solution_dialog_solution_text">Solution</string>
+  <string name="hint_solution_dialog_reveal_hint_text">Show Hint</string>
+  <string name="hint_solution_dialog_hide_hint_description">Hide Hint</string>
+  <string name="hint_solution_dialog_hide_solution_description">Hide solution</string>
+  <string name="hint_solution_dialog_exclusive_solution_text">Di only solution na: %s</string>
+  <string name="hint_solution_dialog_possible_solution_text">One solution na: %s</string>
+  <string name="hint_solution_dialog_reveal_dialog_solution_text">Dis go show di solution. You dey sure?</string>
+  <string name="hint_solution_dialog_reveal_dialog_button_text">Show</string>
   <string name="just_now">just now</string>
   <string name="last_logged_in_recently">recently</string>
   <string name="yesterday">yesterday</string>
-  <string name="return_to_topic">Go back to topic</string>
-  <string name="return_to_lesson">Go back to lesson</string>
-  <string name="explanation">Explanation:</string>
-  <string name="drag_and_drop_interaction_group_merge_hint">If two items dey equal, join dem.</string>
-  <string name="link_to_item_below">Link to item %s</string>
-  <string name="unlink_items">Unlink items at %s</string>
-  <string name="move_item_down_content_description">Move item down to %s</string>
-  <string name="move_item_up_content_description">Move item up to %s</string>
-  <string name="up_button_disabled">Up</string>
-  <string name="down_button_disabled">Down</string>
+  <string name="hint_solution_dialog_explanation_text">Explanation:</string>
+  <string name="state_fragment_drag_drop_interaction_group_merge_hint">If two items dey equal, join dem.</string>
+  <string name="state_fragment_drag_drop_interaction_link_to_item_below">Link to item %s</string>
+  <string name="state_fragment_drag_drop_interaction_unlink_items">Unlink items at %s</string>
+  <string name="state_fragment_drag_drop_interaction_move_item_down_content_description">Move item down to %s</string>
+  <string name="state_fragment_drag_drop_interaction_move_item_up_content_description">Move item up to %s</string>
+  <string name="state_fragment_drag_drop_interaction_up_button_disabled">Up</string>
+  <string name="state_fragment_drag_drop_interaction_down_button_disabled">Down</string>
   <string name="profile_last_visited">%s %s</string>
   <plurals name="minutes_ago">
     <item quantity="zero">0 minutes ago</item>
@@ -440,9 +413,8 @@
     <item quantity="one">a day ago</item>
     <item quantity="other">%s days ago</item>
   </plurals>
-  <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">Abeg select all di correct choices.</string>
+  <string name="topic_fragment_revision_recyclerview_tag">topic_revision_recyclerview_tag</string>
+  <string name="ongoing_topic_list_fragment_recycler_view_tag">ongoing_recycler_view_tag</string>
   <string name="unsupported_app_version_dialog_title">Unsupported app version</string>
   <string name="unsupported_app_version_dialog_message">Dis version of di app no longer dey supported. Abeg update am from di Play Store.</string>
   <string name="unsupported_app_version_dialog_close_button_text">Close app</string>
@@ -457,56 +429,55 @@
   <string name="os_deprecation_dialog_title">Update your Android OS</string>
   <string name="os_deprecation_dialog_message">We go advise make you update your Android OS to fit enjoy %s\'s new features and lessons.\n\nGo your phone\'s Settings app to update your OS.</string>
   <string name="os_deprecation_dialog_dismiss_button_text">Dismiss</string>
-  <string name="splash_screen_developer_label">Developer Build</string>
-  <string name="splash_screen_alpha_label">Alpha</string>
-  <string name="splash_screen_beta_label">Beta</string>
+  <string name="splash_activity_build_developer_label">Developer Build</string>
+  <string name="splash_activity_build_alpha_label">Alpha</string>
+  <string name="splash_activity_build_beta_label">Beta</string>
   <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_message_text">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_preference_checkbox_text">No show dis message again</string>
   <string name="beta_notice_dialog_close_button_text">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="hint_solution_dialog_return_to_lesson_button">Go back to lesson</string>
   <string name="general_availability_notice_dialog_close_button_text">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>
-  <string name="test_number_input_interaction_hint">Write the digit for here.</string>
-  <string name="test_text_input_interaction_hint">Write here.</string>
-  <string name="smallest_text_size_content_description">Smallest text size</string>
-  <string name="largest_text_size_content_description">Largest text size</string>
+  <string name="state_fragment_text_input_default_hint_text">Tap here to put text.</string>
+  <string name="input_interaction_view_test_activity_number_input_hint">Write the digit for here.</string>
+  <string name="input_interaction_view_test_activity_text_input_hint">Write here.</string>
   <string name="coming_soon">Coming Soon</string>
   <string name="recommended_stories">Recommended Stories</string>
   <string name="stories_for_you">Stories For You</string>
   <string name="question_player_activity_title">Practice Mode</string>
   <string name="revision_card_activity_title">Skill revision page</string>
-  <string name="audio_player_seekbar_content_description">Audio progress</string>
-  <string name="audio_language_icon_content_description">Change language</string>
-  <string name="audio_player_on">Audio, ON</string>
-  <string name="audio_player_off">Audio, OFF</string>
-  <string name="correct_submitted_answer">Correct submitted ansa</string>
-  <string name="correct_submitted_answer_with_append">Correct submitted ansa: %s</string>
-  <string name="incorrect_submitted_answer">Incorrect submitted ansa</string>
-  <string name="incorrect_submitted_answer_with_append">Incorrect submitted ansa: %s</string>
+  <string name="audio_fragment_progress_seek_bar_content_description">Audio progress</string>
+  <string name="audio_fragment_language_icon_content_description">Change language</string>
+  <string name="exploration_activity_audio_player_on_text">Audio, ON</string>
+  <string name="exploration_activity_audio_player_off_text">Audio, OFF</string>
+  <string name="state_fragment_correct_submitted_answer">Correct submitted ansa</string>
+  <string name="state_fragment_correct_submitted_answer_with_append">Correct submitted ansa: %s</string>
+  <string name="state_fragment_incorrect_submitted_answer">Incorrect submitted ansa</string>
+  <string name="state_fragment_incorrect_submitted_answer_with_append">Incorrect submitted ansa: %s</string>
   <string name="third_party_dependency_list_activity_title">Third-party Dependencies</string>
   <string name="third_party_dependency_version_formatter">version %s</string>
   <string name="license_list_activity_title">Copyright Licenses</string>
   <string name="license_text_viewer_activity_title">Copyright License Viewer</string>
   <string name="help_activity_back_arrow_description">Go back to %s</string>
-  <string name="help_activity_third_party_dependencies_list">third-party dependencies list</string>
-  <string name="help_activity_copyright_licenses_list">copyright licenses list</string>
+  <string name="help_activity_third_party_dependencies_text">third-party dependencies list</string>
+  <string name="help_activity_copyright_licenses_text">copyright licenses list</string>
   <string name="resume_lesson_activity_title">Resume Lesson</string>
-  <string name="resume_lesson_button">Continue</string>
-  <string name="start_over_lesson_button">Start Over</string>
-  <string name="home_screen_good_morning_greeting_fragment">Good morning,</string>
-  <string name="home_screen_good_afternoon_greeting_fragment">Good afternoon,</string>
-  <string name="home_screen_good_evening_greeting_fragment">Good evening,</string>
+  <string name="resume_lessons_fragment_continue_button_text">Continue</string>
+  <string name="resume_lessons_fragment_start_over_button_text">Start Over</string>
+  <string name="home_activity_good_morning_greeting_text">Good morning,</string>
+  <string name="home_activity_good_afternoon_greeting_text">Good afternoon,</string>
+  <string name="home_activity_good_evening_greeting_text">Good evening,</string>
   <string name="policy_activity_title">Policy Page</string>
-  <string name="privacy_policy_title">Privacy Policy</string>
-  <string name="privacy_policy_web_link">Please visit &lt;a href=\"https://www.oppia.org/privacy-policy\"&gt;dis page&lt;/a&gt; for di latest version of dis privacy policy.</string>
-  <string name="terms_of_service_title">Terms of Service</string>
-  <string name="agree_to_terms">By using %s, you dey agree to our &lt;br&gt; &lt;oppia-noninteractive-policy link=\"tos\"&gt;Terms of Service&lt;/oppia-noninteractive-policy&gt; and &lt;oppia-noninteractive-policy link=\"privacy\"&gt;Privacy Policy&lt;/oppia-noninteractive-policy&gt;.</string>
-  <string name="terms_of_service_web_link">Abeg visit &lt;a href=\"https://www.oppia.org/terms\"&gt;dis page&lt;/a&gt; for di latest version of dese terms.</string>
+  <string name="policy_activity_privacy_policy_title">Privacy Policy</string>
+  <string name="policy_activity_privacy_web_link">Please visit &lt;a href=\"https://www.oppia.org/privacy-policy\"&gt;dis page&lt;/a&gt; for di latest version of dis privacy policy.</string>
+  <string name="policy_activity_terms_of_service_title">Terms of Service</string>
+  <string name="policy_activity_agree_to_terms_text">By using %s, you dey agree to our &lt;br&gt; &lt;oppia-noninteractive-policy link=\"tos\"&gt;Terms of Service&lt;/oppia-noninteractive-policy&gt; and &lt;oppia-noninteractive-policy link=\"privacy\"&gt;Privacy Policy&lt;/oppia-noninteractive-policy&gt;.</string>
+  <string name="policy_activity_terms_web_link">Abeg visit &lt;a href=\"https://www.oppia.org/terms\"&gt;dis page&lt;/a&gt; for di latest version of dese terms.</string>
   <string name="faq_question_1">How I go fit create a new profile?</string>
   <string name="faq_question_2">How I go delete a profile?</string>
   <string name="faq_question_3">How I go take change my email/phone nomba?</string>
@@ -523,59 +494,59 @@
   <string name="faq_answer_6">&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_7">&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_9">&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>
-  <string name="revision_navigation_cards_header">Continue Studying</string>
+  <string name="profile_edit_fragment_test_activity_title">Profile Edit Fragment Test Activity</string>
+  <string name="administrator_controls_fragment_test_activity_title">Administrator Controls Fragment Test Activity</string>
+  <string name="revision_card_fragment_continue_studying_text">Continue Studying</string>
   <string name="state_fragment_hint_bar_forced_announcement_text">Go di bottom of di screen for a hint.</string>
   <string name="state_fragment_item_selection_no_items_selected_hint_text">Abeg select all di correct choices.</string>
   <string name="state_fragment_item_selection_some_items_selected_hint_text">You fit select more choices.</string>
   <string name="state_fragment_item_selection_max_items_selected_hint_text">No more dan %s choices go dey selected.</string>
   <string name="survey_activity_title">Survey</string>
-  <string name="survey_previous_button">Previous</string>
-  <string name="survey_submit_button">Submit</string>
-  <string name="survey_free_form_text_hint">Leave your feedback for here</string>
-  <string name="survey_continue_survey_button">Continue Survey</string>
-  <string name="survey_exit_button">Exit</string>
-  <string name="survey_exit_button_description">Exit Survey</string>
-  <string name="survey_exit_confirmation_text">You sure sey you wan exit the survey?</string>
-  <string name="survey_onboarding_message_text">Your feedback go help us serve learners like you well-well. You go like complete a short survey about your experience?</string>
-  <string name="survey_begin_survey_button">Begin Survey</string>
-  <string name="survey_maybe_later_button">Maybe Later</string>
-  <string name="survey_thank_you_message_text">Thank you for completing the survey. We hope sey you don enjoy using %s!</string>
-  <string name="survey_exit_survey_button">Exit survey</string>
-  <string name="survey_onboarding_title_text">We go like hear how you feel!</string>
-  <string name="survey_thank_you_title_text">Thank you</string>
-  <string name="survey_nps_not_at_all_likely_label">0 - Not at all likely</string>
-  <string name="survey_nps_extremely_likely_label">10 - Extremely likely</string>
-  <string name="user_type_question">Abeg select one of the following:</string>
-  <string name="user_type_answer_learner">I be learner</string>
-  <string name="user_type_answer_teacher">I be teacher</string>
-  <string name="user_type_answer_parent">I be parent</string>
-  <string name="user_type_answer_other">Other</string>
-  <string name="market_fit_question">How you go feel if you no fit use %s again?</string>
-  <string name="market_fit_answer_very_disappointed">Very disappointed</string>
-  <string name="market_fit_answer_somewhat_disappointed">Somewhat disappointed</string>
-  <string name="market_fit_answer_not_disappointed">Not disappointed</string>
-  <string name="market_fit_answer_wont_use_oppia">N/A - I no dey use %s again</string>
-  <string name="nps_promoter_feedback_question">We dey happy sey you don enjoy your experience with %s. Abeg share wetin help you the most:</string>
-  <string name="nps_passive_feedback_question">Thanks for responding! How we go fit provide better experience for you?</string>
-  <string name="nps_detractor_feedback_question">Abeg help us improve your experience! Tell us the primary reason for your score:</string>
-  <string name="nps_score_question">On a scale from 0–10, how likely you dey to recommend %s to a friend or colleague?</string>
-  <string name="previous_subtopic_talkback_text">The previous subtopic na %s</string>
-  <string name="next_subtopic_talkback_text">The next subtopic na %s</string>
-  <string name="app_info_icon_content_description">App Info</string>
-  <string name="spotlight_overlay_arrow_content_description">Spotlight Overlay Arrow</string>
-  <string name="close_spotlight_button_content_description">Close Spotlight Button</string>
-  <string name="previous_state_navigation_button_content_description">Previous State Navigation Button</string>
-  <string name="developer_options_icon_content_description">Developer Options Icon</string>
-  <string name="administrator_controls_icon_content_description">Administrator Controls Icon</string>
+  <string name="survey_fragment_previous_button">Previous</string>
+  <string name="survey_fragment_submit_button">Submit</string>
+  <string name="survey_fragment_free_form_text">Leave your feedback here</string>
+  <string name="survey_activity_exit_dialog_continue_button">Continue Survey</string>
+  <string name="survey_activity_exit_dialog_exit_button">Exit</string>
+  <string name="survey_activity_exit_dialog_exit_button_description">Exit Survey</string>
+  <string name="survey_activity_exit_dialog_confirmation_text">You sure sey you wan exit the survey?</string>
+  <string name="survey_activity_exit_dialog_onboarding_text">Your feedback go help us serve learners like you well-well. You go like complete a short survey about your experience?</string>
+  <string name="survey_activity_welcome_dialog_begin_survey_button">Begin Survey</string>
+  <string name="survey_activity_welcome_dialog_maybe_later_button">Maybe Later</string>
+  <string name="survey_activity_outer_dialog_thank_you_message">Thank you for completing the survey. We hope sey you don enjoy using %s!</string>
+  <string name="survey_activity_outer_dialog_finish_button">Exit survey</string>
+  <string name="survey_activity_welcome_dialog_onboarding_title_text">We go like hear how you feel!</string>
+  <string name="survey_activity_outer_dialog_onboarding_title_text">Thank you</string>
+  <string name="survey_activity_nps_score_not_likely_text">0 - Not at all likely</string>
+  <string name="survey_activity_nps_score_extremely_likely_text">10 - Extremely likely</string>
+  <string name="survey_fragment_user_type_question">Abeg select one of the following:</string>
+  <string name="survey_fragment_user_type_answer_learner">I be learner</string>
+  <string name="survey_fragment_user_type_answer_teacher">I be teacher</string>
+  <string name="survey_fragment_user_type_answer_parent">I be parent</string>
+  <string name="survey_fragment_user_type_answer_other">Other</string>
+  <string name="survey_fragment_market_fit_question">How you go feel if you no fit use %s again?</string>
+  <string name="survey_fragment_market_fit_answer_very_disappointed">Very disappointed</string>
+  <string name="survey_fragment_market_fit_answer_somewhat_disappointed">Somewhat disappointed</string>
+  <string name="survey_fragment_market_fit_answer_not_disappointed">Not disappointed</string>
+  <string name="survey_fragment_market_fit_answer_wont_use_oppia">N/A - I no dey use %s again</string>
+  <string name="survey_fragment_nps_promoter_feedback_question">We dey happy sey you don enjoy your experience with %s. Abeg share wetin help you the most:</string>
+  <string name="survey_fragment_nps_passive_feedback_question">Thanks for responding! How we go fit provide better experience for you?</string>
+  <string name="survey_fragment_nps_detractor_feedback_question">Abeg help us improve your experience! Tell us the primary reason for your score:</string>
+  <string name="survey_fragment_nps_score_question">On a scale from 0–10, how likely you dey to recommend %s to a friend or colleague?</string>
+  <string name="topic_fragment_revision_previous_subtopic_talkback_text">The previous subtopic na %s</string>
+  <string name="topic_fragment_revision_next_subtopic_talkback_text">The next subtopic na %s</string>
+  <string name="app_version_fragment_app_info_icon_description">App Info</string>
+  <string name="spotlight_fragment_overlay_arrow_content_description">Spotlight Overlay Arrow</string>
+  <string name="spotlight_fragment_close_button_content_description">Close Spotlight Button</string>
+  <string name="state_fragment_previous_navigation_button_description">Previous State Navigation Button</string>
+  <string name="navigation_drawer_fragment_developer_options_icon_description">Developer Options Icon</string>
+  <string name="navigation_drawer_fragment_administrator_controls_icon_description">Administrator Controls Icon</string>
   <string name="options_menu_content_description">Options Menu</string>
-  <string name="previous_button_content_description">Previous Button</string>
-  <string name="next_button_content_description">Next Button</string>
-  <string name="language_icon_content_description">Language Icon</string>
-  <string name="setting_icon_content_description">Setting Icon</string>
-  <string name="profile_picture_image_view_content_description">Profile Picture Image View</string>
-  <string name="lock_icon_content_description">Lock Icon</string>
-  <string name="download_status_image_content_description">Download Status</string>
+  <string name="state_fragment_previous_button_description">Previous Button</string>
+  <string name="state_fragment_next_button_description">Next Button</string>
+  <string name="profile_chooser_fragment_language_icon_description">Language Icon</string>
+  <string name="profile_chooser_fragment_setting_icon_description">Setting Icon</string>
+  <string name="profile_picture_activity_profile_picture_description">Profile Picture Image View</string>
+  <string name="story_fragment_lock_icon_content_description">Lock Icon</string>
+  <string name="topic_fragment_info_download_status_image_description">Download Status</string>
   <string name="font_scale_html_content_text">html Content</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 03ef6e1b366..77bf2f85eb9 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -11,160 +11,146 @@
 * YuriNikolai
 -->
 <resources>
-  <string name="nav_header_desc">Cabeçalho de navegação</string>
-  <string name="menu_options">Opções</string>
-  <string name="menu_my_downloads">Meus Downloads</string>
-  <string name="menu_help">Ajuda</string>
+  <string name="menu_options_text">Opções</string>
+  <string name="navigation_drawer_fragment_menu_my_downloads_text">Meus Downloads</string>
+  <string name="menu_help_text">Ajuda</string>
   <string name="exploration_activity_title">Reprodutor de Exploração</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>
-  <string name="developer_options">Opções de Desenvolvedor</string>
-  <string name="administrator_controls">Controles do administrador</string>
-  <string name="drawer_open_content_description">Menu de Navegação Aberto</string>
-  <string name="drawer_close_content_description">Fechar Menu de Navegação</string>
-  <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_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="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="revision_card_toolbar_title">Cartão de Revisão</string>
+  <string name="exploration_activity_options_menu_close_text">Fechar</string>
+  <string name="navigation_drawer_fragment_switch_profile">Trocar Perfil</string>
+  <string name="navigation_drawer_fragment_developer_options">Opções de Desenvolvedor</string>
+  <string name="administrator_controls_activity_title">Controles do administrador</string>
+  <string name="navigation_drawer_fragment_open_content_description">Menu de Navegação Aberto</string>
+  <string name="navigation_drawer_fragment_close_content_description">Fechar Menu de Navegação</string>
+  <string name="audio_fragment_play_description">Tocar áudio</string>
+  <string name="audio_fragment_pause_description">Pausar áudio</string>
+  <string name="audio_fragment_audio_unavailable_text">%s o áudio não está disponível.</string>
+  <string name="audio_language_dialog_okay_button_text" fuzzy="true">OK</string>
+  <string name="audio_language_dialog_cancel_button_text">Cancelar</string>
+  <string name="audio_language_dialog_title">Idioma de Áudio</string>
+  <string name="audio_fragment_offline_dialog_title">Atualmente Offline</string>
+  <string name="audio_fragment_offline_dialog_message">Certifique-se de que o Wi-Fi ou os dados móveis estejam ativados e tente novamente.</string>
+  <string name="audio_fragment_offline_dialog_positive_button_text" fuzzy="true">OK</string>
+  <string name="cellular_audio_dialog_okay_button_text" fuzzy="true">OK</string>
+  <string name="cellular_audio_dialog_cancel_button_text">Cancelar</string>
+  <string name="cellular_audio_dialog_title">Atualmente em Dados Móveis</string>
+  <string name="cellular_audio_dialog_description">O streaming de áudio pode usar muitos dados móveis.</string>
+  <string name="cellular_audio_dialog_checkboxes_text">Não mostre esta mensagem novamente</string>
+  <string name="concept_card_fragment_title">Cartão de Conceito</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>
-  <string name="unsaved_exploration_dialog_leave_button">Sair</string>
-  <string name="unsaved_exploration_dialog_cancel_button">Cancelar</string>
+  <string name="unsaved_exploration_dialog_leave_button_text">Sair</string>
+  <string name="unsaved_exploration_dialog_cancel_button_text">Cancelar</string>
   <string name="stop_exploration_dialog_title">Pretende ir para a página do tópico?</string>
   <string name="stop_exploration_dialog_description">Seu progresso não será salvo.</string>
-  <string name="stop_exploration_dialog_cancel_button">Cancelar</string>
-  <string name="stop_exploration_dialog_leave_button">Sair</string>
-  <string name="exploration_exit_button_spotlight_hint">Saia a qualquer momento usando este botão. Nós salvaremos seu progresso.</string>
-  <string name="voiceover_icon_spotlight_hint">Gostaria que %s lesse para você? Toque neste botão para experimentar!</string>
-  <string name="voiceover_language_icon_spotlight_hint">Toque para alterar o idioma da narração.</string>
-  <string name="progress_database_full_dialog_title">Capacidade máxima de armazenamento atingida</string>
-  <string name="progress_database_full_dialog_description">O progresso salvo para a lição \"%s\" será excluído.</string>
-  <string name="progress_database_full_dialog_continue_button">Continuar</string>
-  <string name="progress_database_full_dialog_leave_without_saving_progress_button">Sair sem salvar o progresso</string>
-  <string name="progress_database_full_dialog_back_to_lesson_button">De volta à aula</string>
-  <string name="topic_practice_master_these_skills">Domine Essas Habilidades</string>
-  <string name="topic_name_text_view">Razão e Proporção</string>
-  <string name="topic_practice_skills_description">Selecione as habilidades que você gostaria de praticar.</string>
-  <string name="topic_practice_start">Começar</string>
-  <string name="info_tab_content_description">Detalhes sobre o tópico.</string>
-  <string name="revision_tab_content_description">Revise os conceitos aprendidos nas lições concluídas aqui.</string>
-  <string name="practice_tab_content_description">Pratique os conceitos aprendidos nas lições concluídas.</string>
-  <string name="lessons_tab_content_description">Toque aqui para começar a tocar uma lição.</string>
-  <string name="topic_lessons_tab_spotlight_hint">Encontre todas as suas lições aqui.</string>
-  <string name="topic_revision_tab_spotlight_hint">Revise os conceitos aprendidos nas lições concluídas aqui.</string>
-  <string name="first_chapter_spotlight_hint">Toque aqui para começar a tocar uma lição.</string>
-  <string name="state_continue_button">Continuar</string>
-  <string name="state_continue_submit">Enviar</string>
-  <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="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="state_learn_again_button">Aprender Novamente</string>
-  <string name="see_more">Veja Mais</string>
-  <string name="see_less">Veja Menos</string>
-  <string name="FAQs">FAQs</string>
-  <string name="featured_questions">Perguntas em Destaque</string>
-  <string name="frequently_asked_questions">Perguntas Frequentes</string>
+  <string name="stop_exploration_dialog_cancel_button_text">Cancelar</string>
+  <string name="stop_exploration_dialog_leave_button_text">Sair</string>
+  <string name="exploration_activity_exit_button_spotlight_hint">Saia a qualquer momento usando este botão. Nós salvaremos seu progresso.</string>
+  <string name="exploration_activity_voiceover_icon_spotlight_hint">Gostaria que %s lesse para você? Toque neste botão para experimentar!</string>
+  <string name="audio_fragment_voiceover_language_icon_spotlight_hint">Toque para alterar o idioma da narração.</string>
+  <string name="stop_exploration_dialog_progress_full_title">Capacidade máxima de armazenamento atingida</string>
+  <string name="stop_exploration_dialog_progress_full_description">O progresso salvo para a lição \"%s\" será excluído.</string>
+  <string name="stop_exploration_dialog_progress_full_continue_button">Continuar</string>
+  <string name="stop_exploration_dialog_progress_full_without_saving_button">Sair sem salvar o progresso</string>
+  <string name="stop_exploration_dialog_progress_full_back_to_lesson_button">De volta à aula</string>
+  <string name="topic_fragment_practice_master_skills_text">Domine Essas Habilidades</string>
+  <string name="topic_fragment_practice_skills_description">Selecione as habilidades que você gostaria de praticar.</string>
+  <string name="topic_fragment_practice_start_button">Começar</string>
+  <string name="topic_fragment_info_tab_content_description">Detalhes sobre o tópico.</string>
+  <string name="topic_fragment_revision_tab_content_description">Revise os conceitos aprendidos nas lições concluídas aqui.</string>
+  <string name="topic_fragment_practice_tab_content_description">Pratique os conceitos aprendidos nas lições concluídas.</string>
+  <string name="topic_fragment_lessons_tab_content_description">Toque aqui para começar a tocar uma lição.</string>
+  <string name="topic_fragment_lessons_tab_spotlight_hint">Encontre todas as suas lições aqui.</string>
+  <string name="topic_fragment_revision_tab_spotlight_hint">Revise os conceitos aprendidos nas lições concluídas aqui.</string>
+  <string name="topic_fragment_first_chapter_spotlight_hint">Toque aqui para começar a tocar uma lição.</string>
+  <string name="state_fragment_continue_button_text">Continuar</string>
+  <string name="state_fragment_previous_state_button_description">Voltar ao cartão anterior</string>
+  <string name="state_fragment_next_state_button_description">Avançar para o próximo cartão</string>
+  <string name="state_fragment_submit_button_text">Enviar</string>
+  <string name="state_fragment_replay_button_text">Repetir</string>
+  <string name="state_fragment_return_to_topic_button_text">Retornar ao Tópico</string>
+  <string name="state_fragment_previous_responses_header">Respostas Anteriores (%s)</string>
+  <string name="state_fragment_image_interaction_answer_text">Cliques em %s</string>
+  <string name="topic_fragment_info_see_more_text">Veja Mais</string>
+  <string name="topic_fragment_info_see_less_text">Veja Menos</string>
+  <string name="faq_list_activity_title">FAQs</string>
+  <string name="faq_list_activity_item_header_text">Perguntas em Destaque</string>
   <string name="faq_activity_title">FAQs (Perguntas Frequentes)</string>
   <string name="pin_password_activity_title">Verificação de PIN</string>
   <string name="onboarding_activity_title">Introdução</string>
-  <string name="frequently_asked_questions_FAQ">Perguntas Frequentes (FAQs)</string>
-  <string name="info">Info</string>
-  <string name="lessons">Lições</string>
-  <string name="practice">Prática</string>
-  <string name="revision">Revisão</string>
-  <string name="administrator_controls_title">Controles do administrador</string>
-  <string name="topic_page">Página do tópico</string>
-  <string name="topic_name">Tópico: %s</string>
-  <string name="topic">Tópico</string>
+  <string name="help_activity_faq_text">Perguntas Frequentes (FAQs)</string>
+  <string name="topic_fragment_info">Info</string>
+  <string name="topic_fragment_lessons">Lições</string>
+  <string name="topic_fragment_practice">Prática</string>
+  <string name="topic_fragment_revision">Revisão</string>
+  <string name="topic_activity_title">Página do tópico</string>
+  <string name="topic_fragment_name_text">Tópico: %s</string>
   <string name="ongoing_topic_list_activity_title">Tópicos em Andamento</string>
-  <string name="chapter_name">Capítulo %s: %s</string>
-  <string name="chapter_completed">O capítulo %s com o título %s foi concluído</string>
-  <string name="chapter_in_progress">O capítulo %s com o título %s está em andamento</string>
-  <string name="chapter_prerequisite_title_label">Conclua o capítulo %s: %s para desbloquear este capítulo.</string>
-  <string name="chapter_locked_prerequisite_title_label">O capítulo %s: %s está bloqueado no momento. Conclua o capítulo %s: %s para desbloquear esse capítulo.</string>
-  <string name="chapter_prerequisite_title_label_without_chapter_title">Conclua o capítulo anterior para desbloquear este capítulo.</string>
-  <string name="text_input_default_content_description">Inserir texto.</string>
-  <string name="fractions_default_hint_text">Insira uma fração na forma x/x, ou um número misto na forma x x/x.</string>
-  <string name="fractions_default_hint_text_no_integer">Insira uma fração no formato x/x.</string>
-  <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="algebraic_expression_default_hint_text">Digite uma expressão aqui.</string>
-  <string name="math_equation_default_hint_text">Digite uma equação aqui.</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>
-  <string name="math_expression_error_multiple_redundant_parentheses">Remova parênteses extras ao redor de \'(%1$s)\', por exemplo: \'%1$s\'.</string>
-  <string name="math_expression_error_redundant_parentheses_individual_term">Remova parênteses extras ao redor de \'(%1$s)\', por exemplo: \'%1$s\'.</string>
-  <string name="math_expression_error_unnecessary_symbols">Há um \'%s\' inválido na resposta. Por favor, remova-o.</string>
-  <string name="math_expression_error_number_after_var_term">Reorganize a ordem de %1$s e %2$s. Por exemplo: %2$s%1$s.</string>
-  <string name="math_expression_error_consecutive_binary_operators">%1$s e %2$s devem ser separados por um número ou uma variável.</string>
-  <string name="math_expression_error_consecutive_unary_operators">Por favor, remova os símbolos extras em sua resposta.</string>
-  <string name="math_expression_error_missing_lhs_for_addition_operator">Está faltando um número ou variável antes ou depois do símbolo de adição \'%1$s\'? Caso não esteja, remova o \'%1$s\' extra.</string>
-  <string name="math_expression_error_missing_lhs_for_multiplication_operator">Está faltando um número ou variável antes ou depois do símbolo de multiplicação \'%1$s\'? Caso não esteja, remova o \'%1$s\' extra.</string>
-  <string name="math_expression_error_missing_lhs_for_division_operator">Está faltando um número ou variável antes ou depois do símbolo de divisão \'%1$s\'? Caso não esteja, remova o \'%1$s\' extra.</string>
-  <string name="math_expression_error_missing_lhs_for_exponentiation_operator">Está faltando um número ou variável antes ou depois do símbolo de exponenciação \'%1$s\'? Caso não esteja, remova o \'%1$s\' extra.</string>
-  <string name="math_expression_error_missing_rhs_for_addition_operator">Parece haver um número ou uma variável faltando após o símbolo de adição \'%s\'.</string>
-  <string name="math_expression_error_missing_rhs_for_subtraction_operator">Parece haver um número ou uma variável faltando após o símbolo de subtração \'%s\'.</string>
-  <string name="math_expression_error_missing_rhs_for_multiplication_operator">Parece haver um número ou uma variável faltando após o símbolo de multiplicação \'%s\'.</string>
-  <string name="math_expression_error_missing_rhs_for_division_operator">Parece haver um número ou uma variável faltando após o símbolo de divisão \'%s\'.</string>
-  <string name="math_expression_error_missing_rhs_for_exponentiation_operator">Parece haver um número ou uma variável faltando após o símbolo de exponenciação \'%s\'.</string>
-  <string name="math_expression_error_exponent_has_variable">Desculpe, variáveis ​​em expoentes não são suportadas pelo aplicativo. Por favor, revise sua resposta.</string>
-  <string name="math_expression_error_exponent_too_large">Desculpe, potências maiores do que 5 não são suportadas pelo serviço. Por favor, revise sua resposta.</string>
-  <string name="math_expression_error_nested_exponent">Desculpe, potências/expoentes repetidos não são suportados pelo aplicativo. Por favor, limite sua resposta a uma potência.</string>
-  <string name="math_expression_error_hanging_square_root">Está faltando entrada para raiz quadrada.</string>
-  <string name="math_expression_error_term_divided_by_zero">Dividir por zero é inválido. Por favor, revise sua resposta.</string>
-  <string name="math_expression_error_variable_in_numeric_expression">Parece que você inseriu algumas variáveis. Certifique-se de que sua resposta contém apenas números e remova quaisquer variáveis ​​de sua resposta.</string>
-  <string name="math_expression_error_invalid_variable">Por favor, use as variáveis ​​especificadas na pergunta e não %s.</string>
-  <string name="math_expression_error_missing_equals">Sua equação está faltando um sinal \'=\'.</string>
-  <string name="math_expression_error_more_than_one_equals">Sua equação contém muitos sinais de \'=\'. Deveria conter apenas um.</string>
-  <string name="math_expression_error_hanging_equals">Um dos lados do \'=\' em sua equação está vazio.</string>
-  <string name="math_expression_error_unsupported_function">A função \'%s\' não é suportada. Por favor, revise sua resposta.</string>
-  <string name="math_expression_error_incomplete_function_name">Será que queria dizer sqrt? Se não, por favor, separe as variáveis ​​com símbolos de multiplicação.</string>
-  <string name="math_expression_error_generic">Desculpe, não conseguimos entender sua resposta. Por favor, verifique se não há erros.</string>
-  <string name="enable_audio_playback_content_description">Habilitar narração de áudio para esta lição.</string>
-  <string name="recently_played_stories">Histórias Reproduzidas Recentemente</string>
-  <string name="last_played_stories">Últimas Histórias Reproduzidas</string>
-  <string name="view_all">Ver Tudo</string>
-  <string name="ongoing_story_last_week">Reproduzidas na Última Semana</string>
-  <string name="ongoing_story_last_month">Reproduzidas no Último Mês</string>
+  <string name="topic_fragment_lessons_chapter_play_name_text">Capítulo %s: %s</string>
+  <string name="topic_fragment_lessons_chapter_completed_text">O capítulo %s com o título %s foi concluído</string>
+  <string name="topic_fragment_lessons_chapter_in_progress_text">O capítulo %s com o título %s está em andamento</string>
+  <string name="topic_fragment_lessons_chapter_prerequisite_label">Conclua o capítulo %s: %s para desbloquear este capítulo.</string>
+  <string name="topic_fragment_lessons_chapter_locked_prerequisite_label">O capítulo %s: %s está bloqueado no momento. Conclua o capítulo %s: %s para desbloquear esse capítulo.</string>
+  <string name="topic_fragment_lessons_without_chapter_prerequisite_label">Conclua o capítulo anterior para desbloquear este capítulo.</string>
+  <string name="state_fragment_text_input_interaction_content_description">Inserir texto.</string>
+  <string name="state_fragment_fraction_input_interaction_hint">Insira uma fração na forma x/x, ou um número misto na forma x x/x.</string>
+  <string name="state_fragment_fraction_input_interaction_no_integer_hint">Insira uma fração no formato x/x.</string>
+  <string name="state_fragment_numeric_input_interaction_hint">Digite um número.</string>
+  <string name="state_fragment_numeric_input_interaction_default_hint">Digite uma expressão aqui, usando apenas números.</string>
+  <string name="state_fragment_algebraic_input_interaction_default_hint">Digite uma expressão aqui.</string>
+  <string name="state_fragment_math_equation_default_hint">Digite uma equação aqui.</string>
+  <string name="state_fragment_math_expression_space_error">Por favor, remova os espaços entre os números em sua resposta.</string>
+  <string name="state_fragment_math_expression_unbalanced_parentheses_error">Feche ou remova os parênteses.</string>
+  <string name="state_fragment_math_expression_single_redundant_parentheses_error">Por favor, remova os parênteses ao redor da resposta inteira: \'%s\'.</string>
+  <string name="state_fragment_math_expression_multiple_redundant_parentheses_error">Remova parênteses extras ao redor de \'(%1$s)\', por exemplo: \'%1$s\'.</string>
+  <string name="state_fragment_math_expression_individual_redundant_parentheses_error">Remova parênteses extras ao redor de \'(%1$s)\', por exemplo: \'%1$s\'.</string>
+  <string name="state_fragment_math_expression_unnecessary_symbols_error">Há um \'%s\' inválido na resposta. Por favor, remova-o.</string>
+  <string name="state_fragment_math_expression_number_after_var_error">Reorganize a ordem de %1$s e %2$s. Por exemplo: %2$s%1$s.</string>
+  <string name="state_fragment_math_expression_consecutive_binary_operators_error">%1$s e %2$s devem ser separados por um número ou uma variável.</string>
+  <string name="state_fragment_math_expression_consecutive_unary_operators_error">Por favor, remova os símbolos extras em sua resposta.</string>
+  <string name="state_fragment_math_expression_missing_lhs_for_addition_error">Está faltando um número ou variável antes ou depois do símbolo de adição \'%1$s\'? Caso não esteja, remova o \'%1$s\' extra.</string>
+  <string name="state_fragment_math_expression_missing_lhs_for_multiplication_error">Está faltando um número ou variável antes ou depois do símbolo de multiplicação \'%1$s\'? Caso não esteja, remova o \'%1$s\' extra.</string>
+  <string name="state_fragment_math_expression_missing_lhs_for_division_error">Está faltando um número ou variável antes ou depois do símbolo de divisão \'%1$s\'? Caso não esteja, remova o \'%1$s\' extra.</string>
+  <string name="state_fragment_math_expression_missing_lhs_for_exponentiation_error">Está faltando um número ou variável antes ou depois do símbolo de exponenciação \'%1$s\'? Caso não esteja, remova o \'%1$s\' extra.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_addition_error">Parece haver um número ou uma variável faltando após o símbolo de adição \'%s\'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_subtraction_error">Parece haver um número ou uma variável faltando após o símbolo de subtração \'%s\'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_multiplication_error">Parece haver um número ou uma variável faltando após o símbolo de multiplicação \'%s\'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_division_error">Parece haver um número ou uma variável faltando após o símbolo de divisão \'%s\'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_exponentiation_error">Parece haver um número ou uma variável faltando após o símbolo de exponenciação \'%s\'.</string>
+  <string name="state_fragment_math_expression_exponent_has_variable_error">Desculpe, variáveis ​​em expoentes não são suportadas pelo aplicativo. Por favor, revise sua resposta.</string>
+  <string name="state_fragment_math_expression_exponent_too_large_error">Desculpe, potências maiores do que 5 não são suportadas pelo serviço. Por favor, revise sua resposta.</string>
+  <string name="state_fragment_math_expression_nested_exponent_error">Desculpe, potências/expoentes repetidos não são suportados pelo aplicativo. Por favor, limite sua resposta a uma potência.</string>
+  <string name="state_fragment_math_expression_hanging_square_root_error">Está faltando entrada para raiz quadrada.</string>
+  <string name="state_fragment_math_expression_divided_by_zero_error">Dividir por zero é inválido. Por favor, revise sua resposta.</string>
+  <string name="state_fragment_math_expression_variable_in_numeric_error">Parece que você inseriu algumas variáveis. Certifique-se de que sua resposta contém apenas números e remova quaisquer variáveis ​​de sua resposta.</string>
+  <string name="state_fragment_math_expression_invalid_variable_error">Por favor, use as variáveis ​​especificadas na pergunta e não %s.</string>
+  <string name="state_fragment_math_expression_missing_equals_error">Sua equação está faltando um sinal \'=\'.</string>
+  <string name="state_fragment_math_expression_more_than_one_equals_error">Sua equação contém muitos sinais de \'=\'. Deveria conter apenas um.</string>
+  <string name="state_fragment_math_expression_hanging_equals_error">Um dos lados do \'=\' em sua equação está vazio.</string>
+  <string name="state_fragment_math_expression_unsupported_function_error">A função \'%s\' não é suportada. Por favor, revise sua resposta.</string>
+  <string name="state_fragment_math_expression_incomplete_function_name_error">Será que queria dizer sqrt? Se não, por favor, separe as variáveis ​​com símbolos de multiplicação.</string>
+  <string name="state_fragment_math_expression_generic_error">Desculpe, não conseguimos entender sua resposta. Por favor, verifique se não há erros.</string>
+  <string name="home_activity_recently_played_stories">Histórias Reproduzidas Recentemente</string>
+  <string name="home_activity_last_played_stories">Últimas Histórias Reproduzidas</string>
+  <string name="home_activity_view_all_text">Ver Tudo</string>
+  <string name="home_activity_ongoing_story_last_week">Reproduzidas na Última Semana</string>
+  <string name="home_activity_ongoing_story_last_month">Reproduzidas no Último Mês</string>
   <string name="story_activity_title">Lista de Capítulos</string>
-  <string name="lesson_thumbnail_content_description">Imagem para %s</string>
-  <string name="stories_you_can_play">Histórias que Você Pode Reproduzir</string>
-  <string name="navigate_up">Navegar para cima</string>
-  <string name="recently_played_activity">Histórias Reproduzidas Recentemente</string>
-  <string name="topic_downloaded">Tópico Baixado</string>
-  <string name="downloaded">Baixado</string>
-  <string name="question_player_title">Modo de Prática</string>
-  <string name="question_training_session_progress">Questão %s de %s</string>
-  <string name="question_training_session_progress_finished">Concluído</string>
-  <string name="question_training_session_finished_header">Concluído</string>
-  <string name="question_training_session_finished_message">Você concluiu todas as perguntas! Você pode escolher reproduzir outro conjunto de perguntas ou retornar ao tópico.</string>
-  <string name="status_in_progress">Em Andamento</string>
-  <string name="status_completed">Completado</string>
-  <string name="show_chapter_list">Mostrar lista de capítulos</string>
-  <string name="hide_chapter_list">Esconder lista de capítulos</string>
-  <string name="play_pause_audio">Reproduzir/Pausar Áudio</string>
-  <string name="preferences">Preferências</string>
+  <string name="home_activity_lesson_thumbnail_description">Imagem para %s</string>
+  <string name="home_activity_topic_play_text">Histórias que Você Pode Reproduzir</string>
+  <string name="navigate_up_text">Navegar para cima</string>
+  <string name="recently_played_activity_title">Histórias Reproduzidas Recentemente</string>
+  <string name="topic_fragment_info_topic_downloaded">Tópico Baixado</string>
+  <string name="exploration_activity_question_player_title">Modo de Prática</string>
+  <string name="topic_fragment_question_training_session_progress">Questão %s de %s</string>
+  <string name="topic_fragment_question_training_session_progress_finished">Concluído</string>
+  <string name="topic_fragment_question_end_session_header_text">Concluído</string>
+  <string name="topic_fragment_question_end_session_body_text">Você concluiu todas as perguntas! Você pode escolher reproduzir outro conjunto de perguntas ou retornar ao tópico.</string>
+  <string name="topic_fragment_lessons_story_status_in_progress">Em Andamento</string>
+  <string name="topic_fragment_lessons_story_status_completed">Completado</string>
+  <string name="topic_fragment_lessons_show_chapter_list">Mostrar lista de capítulos</string>
+  <string name="topic_fragment_lessons_hide_chapter_list">Esconder lista de capítulos</string>
   <string name="profile_progress_activity_title">Página de Progresso do Perfil</string>
-  <string name="search">Buscar</string>
   <string name="fraction_error_invalid_chars">Use apenas dígitos numéricos, espaços ou barras (/)</string>
   <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>
@@ -183,7 +169,6 @@
   <string name="size_mb">%s MB</string>
   <string name="size_gb">%s GB</string>
   <string name="correct">Correto!</string>
-  <string name="topic_prefix">Tópico: %s</string>
   <plurals name="chapter_count" fuzzy="true">
     <item quantity="one">1 Capítulo\n    </item>
     <item quantity="other">\n      %s Capítulos\n    </item>
@@ -210,276 +195,263 @@
     <item quantity="zero">%s Tópicos em andamento</item>
     <item quantity="other">%s Tópicos em andamento</item>
   </plurals>
-  <string name="profile_chooser_activity_label">Página de seleção de perfil</string>
-  <string name="profile_chooser_admin">Administrador</string>
-  <string name="profile_chooser_select">Selecione seu perfil</string>
-  <string name="profile_chooser_add">Novo Perfil</string>
-  <string name="set_up_multiple_profiles">Configurar Múltiplos Perfis</string>
-  <string name="set_up_multiple_profiles_description">Adicione até 10 usuários à sua conta. Perfeito para famílias e salas de aula.</string>
-  <string name="profile_chooser_administrator_controls">Controles do Administrador</string>
-  <string name="profile_chooser_language">Idioma</string>
-  <string name="admin_auth_toolbar">Controles do Administrador</string>
+  <string name="profile_chooser_activity_title">Página de seleção de perfil</string>
+  <string name="profile_chooser_fragment_admin_text">Administrador</string>
+  <string name="profile_chooser_fragment_select_text">Selecione seu perfil</string>
+  <string name="profile_chooser_fragment_add_text">Novo Perfil</string>
+  <string name="profile_chooser_fragment_set_up_multiple_profiles">Configurar Múltiplos Perfis</string>
+  <string name="profile_chooser_fragment_add_profile_description_text">Adicione até 10 usuários à sua conta. Perfeito para famílias e salas de aula.</string>
+  <string name="profile_chooser_fragment_administrator_controls_text">Controles do Administrador</string>
+  <string name="profile_chooser_fragment_language_text">Idioma</string>
+  <string name="admin_auth_activity_title">Controles do Administrador</string>
   <string name="admin_auth_activity_add_profiles_title">Autorize para adicionar perfis</string>
   <string name="admin_auth_activity_access_controls_title">Autorize para acessar os Controles do Administrador</string>
-  <string name="admin_auth_heading">Autorização do administrador necessária</string>
-  <string name="admin_auth_sub">Insira o PIN do administrador para criar uma nova conta.</string>
-  <string name="admin_auth_admin_controls_sub">Insira o PIN do administrador para acessar os Controles do Administrador.</string>
-  <string name="admin_auth_pin">PIN do Administrador</string>
-  <string name="admin_auth_incorrect">PIN do administrador incorreto. Por favor, tente novamente.</string>
-  <string name="admin_auth_null">Insira o PIN do administrador.</string>
-  <string name="admin_auth_submit">Enviar</string>
-  <string name="admin_auth_close">Fechar</string>
-  <string name="admin_pin_requirement_description">Antes de adicionarmos perfis, precisamos proteger sua conta criando um PIN. Isso lhe dá a capacidade de autorizar o gerenciamento de perfis no dispositivo.</string>
-  <string name="admin_pin_pin_description">Use um PIN que você definiu para contas pessoais, como bancos ou previdência social.</string>
-  <string name="admin_pin_new_pin">Novo PIN de 5 dígitos</string>
-  <string name="admin_pin_new_confirm">Confirmar PIN de 5 dígitos</string>
-  <string name="admin_pin_error_pin_length">Seu PIN deve ter 5 dígitos.</string>
-  <string name="admin_pin_error_pin_confirm_wrong">Certifique-se de que os dois PINs coincidam.</string>
-  <string name="save">Salvar</string>
+  <string name="admin_auth_activity_heading_text">Autorização do administrador necessária</string>
+  <string name="admin_auth_activity_subheading_text">Insira o PIN do administrador para criar uma nova conta.</string>
+  <string name="admin_auth_activity_controls_subheading_text">Insira o PIN do administrador para acessar os Controles do Administrador.</string>
+  <string name="admin_auth_activity_input_pin_hint_text">PIN do Administrador</string>
+  <string name="admin_auth_activity_incorrect_pin_label">PIN do administrador incorreto. Por favor, tente novamente.</string>
+  <string name="admin_auth_activity_null_pin_input_label">Insira o PIN do administrador.</string>
+  <string name="admin_auth_activity_submit_button_text">Enviar</string>
+  <string name="admin_auth_activity_tool_bar_content_desc">Fechar</string>
+  <string name="admin_pin_activity_requirement_description_text">Antes de adicionarmos perfis, precisamos proteger sua conta criando um PIN. Isso lhe dá a capacidade de autorizar o gerenciamento de perfis no dispositivo.</string>
+  <string name="admin_pin_activity_warning_text">Use um PIN que você definiu para contas pessoais, como bancos ou previdência social.</string>
+  <string name="admin_pin_activity_input_new_pin_hint">Novo PIN de 5 dígitos</string>
+  <string name="admin_pin_activity_input_confirm_pin_hint">Confirmar PIN de 5 dígitos</string>
+  <string name="admin_pin_activity_pin_length_error">Seu PIN deve ter 5 dígitos.</string>
+  <string name="admin_pin_activity_wrong_pin_text">Certifique-se de que os dois PINs coincidam.</string>
+  <string name="admin_pin_activity_submit_button_text">Salvar</string>
   <string name="admin_pin_activity_title">Autorize para adicionar perfis</string>
-  <string name="add_profile_activity_label">Novo Perfil</string>
-  <string name="add_profile_title">Novo Perfil</string>
-  <string name="add_profile_input_name">Nome</string>
-  <string name="add_profile_input_pin">PIN de 3 dígitos</string>
-  <string name="add_profile_input_confirm_pin">Confirmar PIN de 3 dígitos</string>
-  <string name="add_profile_allow_download_heading">Permitir Acesso a Download</string>
-  <string name="add_profile_allow_download_sub">O usuário pode baixar e excluir conteúdo sem o PIN do administrador.</string>
-  <string name="add_profile_create_btn">Criar</string>
-  <string name="add_profile_close">Fechar</string>
-  <string name="add_profile_pin_info">Com um PIN, ninguém mais pode acessar um perfil além deste usuário atribuído.</string>
-  <string name="add_profile_error_image_failed_store">Falha ao armazenar sua imagem de avatar. Por favor, tente novamente.</string>
-  <string name="add_profile_error_name_not_unique">Este nome já está em uso por outro perfil.</string>
-  <string name="add_profile_error_name_empty">Digite um nome válido para esse perfil.</string>
-  <string name="add_profile_error_name_only_letters">Escolha um nome de perfil que não inclua números ou símbolos.</string>
-  <string name="add_profile_error_pin_length">Seu PIN deve ter 3 dígitos.</string>
-  <string name="add_profile_error_pin_confirm_wrong">Certifique-se de que os dois PINs coincidam.</string>
-  <string name="add_profile_info_content_description">Mais informações sobre PINs de 3 dígitos.</string>
-  <string name="current_profile_picture_content_description">Foto de perfil atual</string>
-  <string name="edit_profile_picture_content_description">Editar foto de perfil</string>
-  <string name="onboarding_slide_0_title">Bem-vindo à %s!</string>
-  <string name="onboarding_slide_0_description">Aprenda o que você quiser de uma forma eficaz e divertida.</string>
-  <string name="onboarding_slide_1_title">Adicione usuários à sua conta.</string>
-  <string name="onboarding_slide_1_description">Compartilhe a experiência e crie até 10 perfis.</string>
-  <string name="onboarding_slide_2_title">Baixe para usar offline.</string>
-  <string name="onboarding_slide_2_description">Continue aprendendo suas lições sem conexão com a internet.</string>
-  <string name="onboarding_slide_3_title">Divirta-se!</string>
-  <string name="onboarding_slide_3_description">Aproveite suas aventuras de aprendizado com nossas lições gratuitas e eficazes.</string>
-  <string name="skip">Pular</string>
-  <string name="next_arrow">Próximo</string>
-  <string name="get_started">Começar</string>
-  <string name="onboarding_slide_dots_content_description">Slide %s de %s</string>
-  <string name="pin_password_hello">Olá, %s!</string>
-  <string name="pin_password_admin_enter">Por favor, insira o PIN do Administrador.</string>
-  <string name="pin_password_user_enter">Por favor, insira seu PIN.</string>
-  <string name="input_pin_password_as_admin">PIN de 5 dígitos do administrador.</string>
-  <string name="input_pin_password_as_user">PIN de 3 dígitos do usuário.</string>
-  <string name="pin_password_forgot_pin">Esqueceu o PIN?</string>
-  <string name="pin_password_incorrect_pin">PIN incorreto.</string>
-  <string name="pin_password_show">Mostrar</string>
-  <string name="pin_password_hide">Esconder</string>
-  <string name="pin_password_close">Fechar</string>
-  <string name="pin_password_success">A alteração do PIN foi bem-sucedida</string>
-  <string name="pin_password_forgot_title">Esqueceu o PIN?</string>
-  <string name="admin_forgot_pin_message">Para redefinir seu PIN, você precisará limpar todos os dados salvos de %s.\n\nLembre-se de que essa ação fará com que todos os perfis e o progresso do usuário sejam excluídos e não pode ser desfeito. Além disso, o aplicativo será fechado quando isso for concluído e precisará ser reaberto.</string>
-  <string name="admin_forgot_pin_reset_app_data_button_text">Redefinir dados de %s.</string>
-  <string name="admin_confirm_app_wipe_title">Confirmar redefinição de dados de %s</string>
-  <string name="admin_confirm_app_wipe_message">Tem certeza de que deseja excluir todos os perfis %s neste dispositivo? Esta ação não poderá ser desfeita.</string>
-  <string name="admin_confirm_app_wipe_positive_button_text">Sim</string>
-  <string name="admin_confirm_app_wipe_negative_button_text">Não</string>
-  <string name="show_hide_password_icon">Mostrar/Esconder ícone da senha</string>
-  <string name="password_shown_icon">Ícone de mostrar a senha</string>
-  <string name="password_hidden_icon">Ícone de esconder a senha</string>
-  <string name="enter_your_pin">Insira seu PIN</string>
-  <string name="pin_password_toolbar_title">Insira o PIN</string>
-  <string name="admin_settings_label">PIN do Administrador</string>
-  <string name="admin_settings_heading">Acesso às configurações do administrador</string>
-  <string name="admin_settings_sub">PIN do administrador necessário para alterar o PIN do usuário</string>
-  <string name="admin_settings_cancel">Cancelar</string>
-  <string name="admin_settings_submit">Enviar</string>
-  <string name="admin_settings_incorrect">PIN do administrador incorreto. Por favor, tente novamente.</string>
-  <string name="admin_settings_enter_user_new_pin">Novo PIN de %1$s</string>
-  <string name="reset_pin_enter">Insira um Novo Pin</string>
-  <string name="reset_pin_enter_dialog_message">Esse PIN será o novo PIN de %s e será necessário ao fazer login.</string>
+  <string name="add_profile_activity_title">Novo Perfil</string>
+  <string name="add_profile_activity_input_name_hint">Nome</string>
+  <string name="add_profile_activity_input_pin_hint">PIN de 3 dígitos</string>
+  <string name="add_profile_activity_input_confirm_pin_hint">Confirmar PIN de 3 dígitos</string>
+  <string name="add_profile_activity_allow_download_text">Permitir Acesso a Download</string>
+  <string name="add_profile_activity_allow_download_sub_text">O usuário pode baixar e excluir conteúdo sem o PIN do administrador.</string>
+  <string name="add_profile_activity_create_button_text">Criar</string>
+  <string name="add_profile_activity_close_dialog_text">Fechar</string>
+  <string name="add_profile_activity_pin_info_dialog_text">Com um PIN, ninguém mais pode acessar um perfil além deste usuário atribuído.</string>
+  <string name="add_profile_activity_name_not_unique_error_text">Este nome já está em uso por outro perfil.</string>
+  <string name="add_profile_activity_name_empty_error_text">Digite um nome válido para esse perfil.</string>
+  <string name="add_profile_activity_name_only_letters_error_text">Escolha um nome de perfil que não inclua números ou símbolos.</string>
+  <string name="add_profile_activity_pin_length_error_text">Seu PIN deve ter 3 dígitos.</string>
+  <string name="add_profile_activity_wrong_confirm_pin_error_text">Certifique-se de que os dois PINs coincidam.</string>
+  <string name="add_profile_activity_info_image_content_description">Mais informações sobre PINs de 3 dígitos.</string>
+  <string name="add_profile_activity_edit_image_content_description">Foto de perfil atual</string>
+  <string name="add_profile_activity_edit_user_image_content_description">Editar foto de perfil</string>
+  <string name="onboarding_activity_slide_0_title">Bem-vindo à %s!</string>
+  <string name="onboarding_activity_slide_0_description">Aprenda o que você quiser de uma forma eficaz e divertida.</string>
+  <string name="onboarding_activity_slide_1_title">Adicione usuários à sua conta.</string>
+  <string name="onboarding_activity_slide_1_description">Compartilhe a experiência e crie até 10 perfis.</string>
+  <string name="onboarding_activity_slide_2_title">Baixe para usar offline.</string>
+  <string name="onboarding_activity_slide_2_description">Continue aprendendo suas lições sem conexão com a internet.</string>
+  <string name="onboarding_activity_slide_3_title">Divirta-se!</string>
+  <string name="onboarding_activity_slide_3_description">Aproveite suas aventuras de aprendizado com nossas lições gratuitas e eficazes.</string>
+  <string name="onboarding_activity_skip_text">Pular</string>
+  <string name="onboarding_activity_next_arrow_text">Próximo</string>
+  <string name="onboarding_activity_get_started_text">Começar</string>
+  <string name="onboarding_activity_slide_dots_content_description">Slide %s de %s</string>
+  <string name="pin_password_activity_hello_text">Olá, %s!</string>
+  <string name="pin_password_activity_enter_text">Por favor, insira o PIN do Administrador.</string>
+  <string name="pin_password_activity_user_enter_text">Por favor, insira seu PIN.</string>
+  <string name="pin_password_activity_admin_input_pin_text">PIN de 5 dígitos do administrador.</string>
+  <string name="pin_password_activity_user_input_pin_text">PIN de 3 dígitos do usuário.</string>
+  <string name="pin_password_activity_forgot_pin_text">Esqueceu o PIN?</string>
+  <string name="pin_password_activity_incorrect_pin_error">PIN incorreto.</string>
+  <string name="pin_password_activity_show_pin_text">Mostrar</string>
+  <string name="pin_password_activity_hide_pin_text">Esconder</string>
+  <string name="pin_password_activity_close_text">Fechar</string>
+  <string name="pin_password_activity_success_text">A alteração do PIN foi bem-sucedida</string>
+  <string name="pin_password_activity_dialog_forgot_title">Esqueceu o PIN?</string>
+  <string name="pin_password_activity_dialog_forgot_message">Para redefinir seu PIN, você precisará limpar todos os dados salvos de %s.\n\nLembre-se de que essa ação fará com que todos os perfis e o progresso do usuário sejam excluídos e não pode ser desfeito. Além disso, o aplicativo será fechado quando isso for concluído e precisará ser reaberto.</string>
+  <string name="pin_password_activity_reset_app_data_button_text">Redefinir dados de %s.</string>
+  <string name="pin_password_activity_reset_dialog_title">Confirmar redefinição de dados de %s</string>
+  <string name="pin_password_activity_reset_dialog_message">Tem certeza de que deseja excluir todos os perfis %s neste dispositivo? Esta ação não poderá ser desfeita.</string>
+  <string name="pin_password_activity_reset_dialog_postive_button_text">Sim</string>
+  <string name="pin_password_activity_reset_dialog_negative_button_text">Não</string>
+  <string name="pin_password_activity_shown_icon_content_description">Ícone de mostrar a senha</string>
+  <string name="pin_password_activity_hidden_icon_content_description">Ícone de esconder a senha</string>
+  <string name="pin_password_activity_toolbar_title">Insira o PIN</string>
+  <string name="admin_settings_dialog_input_pin_hint">PIN do Administrador</string>
+  <string name="admin_settings_dialog_heading">Acesso às configurações do administrador</string>
+  <string name="admin_settings_dialog_message_text">PIN do administrador necessário para alterar o PIN do usuário</string>
+  <string name="admin_settings_dialog_cancel_button_text">Cancelar</string>
+  <string name="admin_settings_dialog_submit_button_text">Enviar</string>
+  <string name="admin_settings_dialog_incorrect_pin_error_text">PIN do administrador incorreto. Por favor, tente novamente.</string>
+  <string name="admin_settings_dialog_new_pin_text">Novo PIN de %1$s</string>
+  <string name="pin_password_activity_reset_pin_dialog_title">Insira um Novo Pin</string>
+  <string name="pin_password_activity_reset_pin_dialog_message">Esse PIN será o novo PIN de %s e será necessário ao fazer login.</string>
   <string name="my_downloads_activity_title">Meus Downloads</string>
-  <string name="tab_downloads">Downloads</string>
-  <string name="tab_updates">Atualizações (2)</string>
+  <string name="my_downloads_fragment_tab_download_text">Downloads</string>
+  <string name="my_downloads_fragment_tab_updates_text">Atualizações (2)</string>
   <string name="home_activity_back_dialog_message">Você gostaria de sair do seu perfil?</string>
-  <string name="home_activity_back_dialog_cancel">Cancelar</string>
-  <string name="home_activity_back_dialog_exit">Sair</string>
+  <string name="home_activity_back_dialog_cancel_button">Cancelar</string>
+  <string name="home_activity_back_dialog_exit_button">Sair</string>
   <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="home_story_promoted_story_spotlight_hint">A partir de agora, você pode ver as lições recomendadas para você aqui.</string>
+  <string name="home_activity_all_topics_text">Selecione um Tópico para começar</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>
-  <string name="profile_last_used">Usado por último</string>
-  <string name="profile_edit_rename">Renomear</string>
-  <string name="profile_edit_reset">Redefinir PIN</string>
-  <string name="profile_edit_mark_chapter_completion">Marcar capítulos concluídos</string>
-  <string name="profile_edit_enable_quick_lesson_language_switching_label">Ativar a troca rápida de idioma</string>
-  <string name="profile_edit_enable_quick_lesson_language_switching_explanation">Permita que esse usuário alterne rapidamente entre inglês e suaíli em uma lição.</string>
-  <string name="profile_edit_delete">Exclusão de Perfil</string>
-  <string name="profile_edit_delete_dialog_title">Apagar este perfil permanentemente?</string>
-  <string name="profile_edit_delete_dialog_message">Todo o progresso será apagado e não pode ser recuperado.</string>
-  <string name="profile_edit_delete_dialog_positive">Apagar</string>
-  <string name="profile_edit_delete_dialog_negative">Cancelar</string>
-  <string name="profile_edit_allow_download_heading">Permitir Acesso a Download</string>
-  <string name="profile_edit_allow_download_sub">O usuário pode baixar e apagar conteúdo sem senha de Administrador</string>
+  <string name="profile_edit_activity_created_text">Criado em %s</string>
+  <string name="profile_edit_activity_last_used_text">Usado por último</string>
+  <string name="profile_edit_activity_rename_text">Renomear</string>
+  <string name="profile_edit_activity_reset_text">Redefinir PIN</string>
+  <string name="profile_edit_activity_mark_chapters_for_completion_button_text">Marcar capítulos concluídos</string>
+  <string name="profile_edit_activity_switching_header_text">Ativar a troca rápida de idioma</string>
+  <string name="profile_edit_activity_switching_label_text">Permita que esse usuário alterne rapidamente entre inglês e suaíli em uma lição.</string>
+  <string name="profile_edit_activity_delete_button_text">Exclusão de Perfil</string>
+  <string name="profile_edit_activity_dialog_title">Apagar este perfil permanentemente?</string>
+  <string name="profile_edit_activity_dialog_message">Todo o progresso será apagado e não pode ser recuperado.</string>
+  <string name="profile_edit_activity_dialog_positive_button">Apagar</string>
+  <string name="profile_edit_activity_dialog_negative_button">Cancelar</string>
+  <string name="profile_edit_activity_allow_download_heading">Permitir Acesso a Download</string>
+  <string name="profile_edit_activity_allow_download_sub">O usuário pode baixar e apagar conteúdo sem senha de Administrador</string>
   <string name="profile_picture_activity_title">Foto do Perfil</string>
-  <string name="profile_progress_edit_dialog_title">Imagem de perfil</string>
-  <string name="profile_picture_edit_alert_dialog_cancel_button">Cancelar</string>
-  <string name="profile_picture_edit_alert_dialog_view_profile_picture">Visualizar Foto do Perfil</string>
-  <string name="profile_picture_edit_alert_dialog_choose_from_library">Escolha da Biblioteca</string>
+  <string name="profile_picture_edit_dialog_title">Imagem de perfil</string>
+  <string name="profile_picture_edit_dialog_cancel_button_text">Cancelar</string>
+  <string name="profile_picture_edit_dialog_view_picture_text">Visualizar Foto do Perfil</string>
+  <string name="profile_picture_edit_dialog_change_picture_text">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_activity_rename_input_hint">Novo Nome</string>
+  <string name="profile_rename_activity_rename_save_button" fuzzy="true">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>
-  <string name="profile_reset_pin_admin_pin_label">PIN de 5 Dígitos</string>
-  <string name="profile_reset_pin_user_confirm_label">Confirmar PIN de 3 Dígitos</string>
-  <string name="profile_reset_pin_admin_confirm_label">Confirmar PIN de 5 dígitos</string>
-  <string name="profile_reset_pin_error_user_pin_length">Seu PIN deve ter 3 dígitos.</string>
-  <string name="profile_reset_pin_error_admin_pin_length">Seu PIN deve ter 5 dígitos.</string>
-  <string name="add_profile_create_a_3_digit_pin">Criar um PIN de 3 Dígitos</string>
-  <string name="add_profile_required">Requerido</string>
-  <string name="back_button">Botão de Voltar</string>
-  <string name="next">Próximo</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>
-  <string name="administrator_controls_edit_profiles">Editar perfis</string>
-  <string name="administrator_controls_download_permissions_label">Permissões de Download</string>
-  <string name="administrator_controls_update_on_wifi_title">Baixar e atualizar apenas com Wi-fi</string>
-  <string name="administrator_controls_update_on_wifi_message">Os tópicos serão baixados e atualizados apenas com Wi-fi. Quaisquer downloads ou atualizações de dados do celular serão enfileirados.</string>
-  <string name="administrator_controls_auto_update_title">Atualizar tópicos automaticamente</string>
-  <string name="administrator_controls_auto_update_message">Os tópicos baixados com novo conteúdo disponível serão atualizados automaticamente.</string>
-  <string name="administrator_controls_app_information_label">Informações do Aplicativo</string>
-  <string name="administrator_controls_app_version">Versão do Aplicativo</string>
-  <string name="administrator_controls_account_actions_label">Ações da Conta</string>
-  <string name="administrator_controls_log_out">Sair</string>
-  <string name="log_out_dialog_cancel_button">Cancelar</string>
-  <string name="log_out_dialog_okay_button">Ok</string>
-  <string name="log_out_dialog_message">Tem certeza que deseja sair do seu perfil?</string>
-  <string name="app_version_name">Versão do Aplicativo %s</string>
-  <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="profile_reset_pin_fragment_reset_pin_main_text">Insira um novo PIN para o usuário usar ao acessar seu perfil.</string>
+  <string name="profile_reset_pin_fragment_user_pin_text">PIN de 3 Dígitos</string>
+  <string name="profile_reset_pin_fragment_admin_pin_text">PIN de 5 Dígitos</string>
+  <string name="profile_reset_pin_fragment_user_confirm_text">Confirmar PIN de 3 Dígitos</string>
+  <string name="profile_reset_pin_fragment_admin_confirm_text">Confirmar PIN de 5 dígitos</string>
+  <string name="profile_reset_pin_fragment_error_user_pin_length">Seu PIN deve ter 3 dígitos.</string>
+  <string name="profile_reset_pin_fragment_error_admin_pin_length">Seu PIN deve ter 5 dígitos.</string>
+  <string name="add_profile_activity_pin_check_box_text">Criar um PIN de 3 Dígitos</string>
+  <string name="add_profile_activity_user_name_helper_text">Requerido</string>
+  <string name="walkthrough_activity_back_button_text">Botão de Voltar</string>
+  <string name="next_text">Próximo</string>
+  <string name="administrator_controls_fragment_general_label">Geral</string>
+  <string name="administrator_controls_fragment_edit_account_text">Editar conta</string>
+  <string name="administrator_controls_fragment_profile_management_label">Gerenciamento de Perfil</string>
+  <string name="administrator_controls_fragment_edit_profiles_text">Editar perfis</string>
+  <string name="administrator_controls_fragment_download_permissions_label">Permissões de Download</string>
+  <string name="administrator_controls_fragment_topic_update_on_wifi_text">Baixar e atualizar apenas com Wi-fi</string>
+  <string name="administrator_controls_fragment_topic_update_on_wifi_description">Os tópicos serão baixados e atualizados apenas com Wi-fi. Quaisquer downloads ou atualizações de dados do celular serão enfileirados.</string>
+  <string name="administrator_controls_fragment_auto_update_topic_text">Atualizar tópicos automaticamente</string>
+  <string name="administrator_controls_fragment_auto_update_topic_description">Os tópicos baixados com novo conteúdo disponível serão atualizados automaticamente.</string>
+  <string name="administrator_controls_fragment_app_information_text">Informações do Aplicativo</string>
+  <string name="administrator_controls_fragment_app_version_text">Versão do Aplicativo</string>
+  <string name="administrator_controls_fragment_account_actions_text">Ações da Conta</string>
+  <string name="administrator_controls_fragment_log_out_text">Sair</string>
+  <string name="log_out_dialog_cancel_button_text">Cancelar</string>
+  <string name="log_out_dialog_okay_button_text">Ok</string>
+  <string name="log_out_dialog_message_text">Tem certeza que deseja sair do seu perfil?</string>
+  <string name="app_version_fragment_last_update_date_text">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="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="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>
-  <string name="reading_text_size_medium">Médio</string>
-  <string name="reading_text_size_large">Grande</string>
-  <string name="reading_text_size_extra_large">Extra Grande</string>
-  <string name="slide_seekbar_to_control_text_size">Deslize a barra para controlar o tamanho do texto.</string>
-  <string name="profile">Perfil</string>
-  <string name="story_count_text_view">2 Histórias</string>
-  <string name="topics_in_progress">Tópicos em Andamento</string>
-  <string name="topic_in_progress">Tópico em Andamento</string>
-  <string name="stories_completed">Histórias Concluídas</string>
-  <string name="story_completed">História Concluída</string>
+  <string name="option_activity_audio_language_text" fuzzy="true">Áudio Padrão</string>
+  <string name="option_activity_app_language_text">Idioma do Aplicativo</string>
+  <string name="option_activity_reading_text_size">Tamanho do Texto de Leitura</string>
+  <string name="option_activity_reading_text_size_small">Pequeno</string>
+  <string name="option_activity_reading_text_size_medium">Médio</string>
+  <string name="option_activity_reading_text_size_large">Grande</string>
+  <string name="option_activity_reading_text_size_extra_large">Extra Grande</string>
+  <string name="profile_progress_activity_profile_title">Perfil</string>
+  <string name="profile_progress_activity_topics_in_progress_text">Tópicos em Andamento</string>
+  <string name="profile_progress_activity_topic_in_progress_text">Tópico em Andamento</string>
+  <string name="profile_progress_activity_stories_completed_text">Histórias Concluídas</string>
+  <string name="profile_progress_activity_story_completed_text">História Concluída</string>
   <string name="options_activity_title">Opções</string>
   <string name="completed_story_list_activity_title">Histórias Concluídas</string>
+  <string name="app_version_fragment_version_name_text">Versão do Aplicativo %s</string>
   <string name="walkthrough_activity_title">Passo a passo do Aplicativo</string>
-  <string name="walkthrough_welcome_description">Aprenda novas habilidades matemáticas com histórias que mostram como usá-las no seu dia a dia</string>
-  <string name="welcome">\"Bem-vindo %s!\"</string>
-  <string name="what_do_you_want_to_learn">O que você quer aprender?</string>
-  <string name="great">Ótimo</string>
-  <string name="lets_get_started">Vamos começar.</string>
-  <string name="yes">Sim</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>
-  <string name="no_new_hint_available">Nova dica disponível</string>
-  <string name="show_hints_and_solution">Mostrar dicas e solução</string>
-  <string name="hint_list_item_number">Dica %s</string>
-  <string name="hints_and_solution_close_icon_description">Fechar</string>
-  <string name="hints_toolbar_title">Dicas</string>
-  <string name="show_solution">Mostrar solução</string>
-  <string name="reveal_solution">Mostrar solução</string>
-  <string name="hint_list_solution_title">Solução</string>
-  <string name="reveal_hint">Revelar Dica</string>
-  <string name="hide_hint">Ocultar dica</string>
-  <string name="hide_solution">Ocultar solução</string>
-  <string name="hints_list_exclusive_solution_text">A única solução é: %s</string>
-  <string name="hints_list_possible_solution_text">Uma solução é: %s</string>
-  <string name="this_will_reveal_the_solution">Isso revelará a solução. Tem certeza?</string>
-  <string name="reveal">Mostrar</string>
+  <string name="walkthrough_activity_welcome_description">Aprenda novas habilidades matemáticas com histórias que mostram como usá-las no seu dia a dia</string>
+  <string name="walkthrough_activity_welcome_text">\"Bem-vindo %s!\"</string>
+  <string name="walkthrough_activity_topic_header_text">O que você quer aprender?</string>
+  <string name="walkthrough_activity_final_title_text">Ótimo</string>
+  <string name="walkthrough_activity_get_started_text">Vamos começar.</string>
+  <string name="walkthrough_activity_yes_text">Sim</string>
+  <string name="walkthrough_activity_no_text">Não...</string>
+  <string name="walkthrough_activity_pick_different_topic_text">Escolha um\ntópico diferente.</string>
+  <string name="walkthrough_activity_are_you_interested_text">Você está interessado em:\n%s?</string>
+  <string name="question_player_activity_new_hint_available_text">Nova dica disponível</string>
+  <string name="state_fragment_hint_bulb_content_description">Nova dica disponível</string>
+  <string name="state_fragment_open_hint_content_description">Mostrar dicas e solução</string>
+  <string name="hint_solution_dialog_hint_list_item_number">Dica %s</string>
+  <string name="hint_solution_dialog_close_icon_description">Fechar</string>
+  <string name="state_fragment_hint_bar_title">Dicas</string>
+  <string name="hint_solution_dialog_show_solution_text">Mostrar solução</string>
+  <string name="hint_solution_dialog_reveal_solution_text">Mostrar solução</string>
+  <string name="hint_solution_dialog_solution_text">Solução</string>
+  <string name="hint_solution_dialog_reveal_hint_text">Revelar Dica</string>
+  <string name="hint_solution_dialog_hide_hint_description">Ocultar dica</string>
+  <string name="hint_solution_dialog_hide_solution_description">Ocultar solução</string>
+  <string name="hint_solution_dialog_exclusive_solution_text">A única solução é: %s</string>
+  <string name="hint_solution_dialog_possible_solution_text">Uma solução é: %s</string>
+  <string name="hint_solution_dialog_reveal_dialog_solution_text">Isso revelará a solução. Tem certeza?</string>
+  <string name="hint_solution_dialog_reveal_dialog_button_text">Mostrar</string>
   <string name="just_now">Agora</string>
   <string name="last_logged_in_recently">recentemente</string>
   <string name="yesterday">ontem</string>
-  <string name="return_to_topic">Voltar ao tópico</string>
-  <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="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>
-  <string name="move_item_up_content_description">Mover o item para cima para %s</string>
-  <string name="up_button_disabled">Para cima</string>
-  <string name="down_button_disabled">Para baixo</string>
+  <string name="hint_solution_dialog_explanation_text">Explicação:</string>
+  <string name="state_fragment_drag_drop_interaction_group_merge_hint">Se dois itens forem iguais, junte-os.</string>
+  <string name="state_fragment_drag_drop_interaction_link_to_item_below">Link para o item %s</string>
+  <string name="state_fragment_drag_drop_interaction_unlink_items">Desvincular itens em %s</string>
+  <string name="state_fragment_drag_drop_interaction_move_item_down_content_description">Mover o item para baixo para %s</string>
+  <string name="state_fragment_drag_drop_interaction_move_item_up_content_description">Mover o item para cima para %s</string>
+  <string name="state_fragment_drag_drop_interaction_up_button_disabled">Para cima</string>
+  <string name="state_fragment_drag_drop_interaction_down_button_disabled">Para baixo</string>
   <string name="profile_last_visited">%s %s</string>
-  <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="topic_fragment_revision_recyclerview_tag">topic_revision_recyclerview_tag</string>
+  <string name="ongoing_topic_list_fragment_recycler_view_tag">ongoing_recycler_view_tag</string>
   <string name="unsupported_app_version_dialog_title" fuzzy="true">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="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>
+  <string name="splash_activity_build_developer_label">Versão do desenvolvedor</string>
+  <string name="splash_activity_build_alpha_label">Alfa</string>
+  <string name="splash_activity_build_beta_label">Beta</string>
   <string name="beta_notice_dialog_title">Aviso Beta</string>
-  <string name="beta_notice_dialog_message">Olá! Seu aplicativo está sendo atualizado para a versão Beta. Se você tiver problemas ao usar o aplicativo ou tiver dúvidas, entre em contato conosco em android-feedback@oppia.org.</string>
-  <string name="beta_notice_dialog_do_not_show_again_text">Não exibir esta mensagem novamente</string>
+  <string name="beta_notice_dialog_message_text">Olá! Seu aplicativo está sendo atualizado para a versão Beta. Se você tiver problemas ao usar o aplicativo ou tiver dúvidas, entre em contato conosco em android-feedback@oppia.org.</string>
+  <string name="beta_notice_dialog_preference_checkbox_text">Não exibir esta mensagem novamente</string>
   <string name="beta_notice_dialog_close_button_text">OK</string>
   <string name="general_availability_notice_dialog_title">Aviso de disponibilidade geral</string>
   <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="hint_solution_dialog_return_to_lesson_button">Voltar para a lição</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="text_input_default_hint_text">Clique aqui para inserir texto.</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="state_fragment_text_input_default_hint_text">Clique aqui para inserir texto.</string>
   <string name="coming_soon">Em Breve</string>
   <string name="recommended_stories">Histórias Recomendadas</string>
   <string name="stories_for_you">Histórias Para Você</string>
   <string name="question_player_activity_title">Modo de Prática</string>
   <string name="revision_card_activity_title">Página de revisão de habilidades</string>
-  <string name="audio_player_seekbar_content_description">Progresso do áudio</string>
-  <string name="audio_language_icon_content_description">Alterar idioma</string>
-  <string name="audio_player_on">Áudio, LIGADO</string>
-  <string name="audio_player_off">Áudio, DESLIGADO</string>
-  <string name="correct_submitted_answer">Resposta correta enviada</string>
-  <string name="correct_submitted_answer_with_append">Resposta correta enviada: %s</string>
-  <string name="incorrect_submitted_answer">Resposta incorreta enviada</string>
-  <string name="incorrect_submitted_answer_with_append">Resposta incorreta enviada: %s</string>
+  <string name="audio_fragment_progress_seek_bar_content_description">Progresso do áudio</string>
+  <string name="audio_fragment_language_icon_content_description">Alterar idioma</string>
+  <string name="exploration_activity_audio_player_on_text">Áudio, LIGADO</string>
+  <string name="exploration_activity_audio_player_off_text">Áudio, DESLIGADO</string>
+  <string name="state_fragment_correct_submitted_answer">Resposta correta enviada</string>
+  <string name="state_fragment_correct_submitted_answer_with_append">Resposta correta enviada: %s</string>
+  <string name="state_fragment_incorrect_submitted_answer">Resposta incorreta enviada</string>
+  <string name="state_fragment_incorrect_submitted_answer_with_append">Resposta incorreta enviada: %s</string>
   <string name="third_party_dependency_list_activity_title">Dependências de terceiros</string>
   <string name="third_party_dependency_version_formatter">versão %s</string>
   <string name="license_list_activity_title">Licença de Direitos Autorais</string>
   <string name="license_text_viewer_activity_title">Visualizador de Licença de Direitos Autorais</string>
   <string name="help_activity_back_arrow_description">Voltar para %s</string>
-  <string name="help_activity_third_party_dependencies_list">lista de dependências de terceiros</string>
-  <string name="help_activity_copyright_licenses_list">lista de licenças de direitos autorais</string>
+  <string name="help_activity_third_party_dependencies_text">lista de dependências de terceiros</string>
+  <string name="help_activity_copyright_licenses_text">lista de licenças de direitos autorais</string>
   <string name="resume_lesson_activity_title">Retomar lição</string>
-  <string name="resume_lesson_button">Continuar</string>
-  <string name="start_over_lesson_button">Recomeçar</string>
-  <string name="home_screen_good_morning_greeting_fragment">Bom dia,</string>
-  <string name="home_screen_good_afternoon_greeting_fragment">Boa tarde,</string>
-  <string name="home_screen_good_evening_greeting_fragment">Boa noite,</string>
+  <string name="resume_lessons_fragment_continue_button_text">Continuar</string>
+  <string name="resume_lessons_fragment_start_over_button_text">Recomeçar</string>
+  <string name="home_activity_good_morning_greeting_text">Bom dia,</string>
+  <string name="home_activity_good_afternoon_greeting_text">Boa tarde,</string>
+  <string name="home_activity_good_evening_greeting_text">Boa noite,</string>
   <string name="policy_activity_title">Página de Política</string>
-  <string name="privacy_policy_title">Política de Privacidade</string>
-  <string name="privacy_policy_web_link">Por favor visite &lt;a href=\"https://www.oppia.org/privacy-policy\"&gt;esta páginage&lt;/a&gt; para acessar a última versão desta política de privacidade.</string>
-  <string name="terms_of_service_title">Termos de Serviço</string>
-  <string name="agree_to_terms">Ao usar %s, você concorda com nossos &lt;br&gt; &lt;oppia-noninteractive-policy link=\"tos\"&gt;Termos de Serviço&lt;/oppia-noninteractive-policy&gt; e &lt;oppia-noninteractive-policy link=\"privacy\"&gt;Política de Privacidade&lt;/oppia-noninteractive-policy&gt;.</string>
-  <string name="terms_of_service_web_link">Por favor visite &lt;a href=\"https://www.oppia.org/terms\"&gt;esta página&lt;/a&gt; para acessar a última versão destes termos.</string>
+  <string name="policy_activity_privacy_policy_title">Política de Privacidade</string>
+  <string name="policy_activity_privacy_web_link">Por favor visite &lt;a href=\"https://www.oppia.org/privacy-policy\"&gt;esta páginage&lt;/a&gt; para acessar a última versão desta política de privacidade.</string>
+  <string name="policy_activity_terms_of_service_title">Termos de Serviço</string>
+  <string name="policy_activity_agree_to_terms_text">Ao usar %s, você concorda com nossos &lt;br&gt; &lt;oppia-noninteractive-policy link=\"tos\"&gt;Termos de Serviço&lt;/oppia-noninteractive-policy&gt; e &lt;oppia-noninteractive-policy link=\"privacy\"&gt;Política de Privacidade&lt;/oppia-noninteractive-policy&gt;.</string>
+  <string name="policy_activity_terms_web_link">Por favor visite &lt;a href=\"https://www.oppia.org/terms\"&gt;esta página&lt;/a&gt; para acessar a última versão destes termos.</string>
   <string name="faq_question_1">Como posso criar um novo perfil?</string>
   <string name="faq_question_2">Como posso deletar um perfil?</string>
   <string name="faq_question_3">Como posso alterar meu e-mail/número de telefone?</string>
@@ -496,44 +468,44 @@
   <string name="faq_answer_6">&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_7">&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_9">&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>
-  <string name="revision_navigation_cards_header">Continuar estudando</string>
+  <string name="profile_edit_fragment_test_activity_title">Atividade de Teste de Fragmento de Edição de Perfil</string>
+  <string name="administrator_controls_fragment_test_activity_title">Controle Administrativo da Atividade de Teste de Fragmento</string>
+  <string name="revision_card_fragment_continue_studying_text">Continuar estudando</string>
   <string name="state_fragment_hint_bar_forced_announcement_text">Vá até a parte inferior da tela para obter uma dica.</string>
   <string name="state_fragment_item_selection_no_items_selected_hint_text">Por favor, selecione todas as alternativas corretas.</string>
   <string name="state_fragment_item_selection_some_items_selected_hint_text">Pode selecionar outras opções.</string>
   <string name="state_fragment_item_selection_max_items_selected_hint_text">Mais do que %s opções podem ser selecionadas.</string>
   <string name="survey_activity_title">Pesquisa</string>
-  <string name="survey_previous_button">Anterior</string>
-  <string name="survey_submit_button">Enviar</string>
-  <string name="survey_free_form_text_hint">Deixe seu feedback aqui</string>
-  <string name="survey_continue_survey_button">Continuar a pesquisa</string>
-  <string name="survey_exit_button">Sair</string>
-  <string name="survey_exit_button_description">Pesquisa de saída</string>
-  <string name="survey_exit_confirmation_text">Tem certeza de que deseja sair da pesquisa?</string>
-  <string name="survey_onboarding_message_text">Seu feedback nos ajuda a atender melhor alunos como você. Gostaria de responder a uma breve pesquisa sobre sua experiência?</string>
-  <string name="survey_begin_survey_button">Iniciar pesquisa</string>
-  <string name="survey_maybe_later_button">Talvez mais tarde</string>
-  <string name="survey_thank_you_message_text">Obrigado por responder à pesquisa. Esperamos que você tenha gostado de usar o %s!</string>
-  <string name="survey_exit_survey_button">Pesquisa de saída</string>
-  <string name="survey_onboarding_title_text">Gostaríamos muito de receber seu feedback!</string>
-  <string name="survey_thank_you_title_text">Obrigado</string>
-  <string name="survey_nps_not_at_all_likely_label">0 - Pouco provável</string>
-  <string name="survey_nps_extremely_likely_label">10 - Extremamente provável</string>
-  <string name="user_type_question">Selecione uma das opções a seguir:</string>
-  <string name="user_type_answer_learner">Eu sou um formando</string>
-  <string name="user_type_answer_teacher">Eu sou um professor</string>
-  <string name="user_type_answer_parent">Eu sou um pai</string>
-  <string name="user_type_answer_other">Outro</string>
-  <string name="market_fit_question">Como você se sentiria se não pudesse mais usar %s?</string>
-  <string name="market_fit_answer_very_disappointed">Muito decepcionado</string>
-  <string name="market_fit_answer_somewhat_disappointed">Um pouco decepcionado</string>
-  <string name="market_fit_answer_not_disappointed">Não fiquei desapontado</string>
-  <string name="market_fit_answer_wont_use_oppia">N/A - Não uso mais %s</string>
-  <string name="nps_promoter_feedback_question">Ficamos felizes que tenha gostado de sua experiência com a %s. Compartilhe o que mais o ajudou:</string>
-  <string name="nps_passive_feedback_question">Obrigado por responder! Como podemos proporcionar uma experiência melhor?</string>
-  <string name="nps_detractor_feedback_question">Ajude-nos a melhorar sua experiência! Compartilhe o principal motivo da sua pontuação:</string>
-  <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="survey_fragment_previous_button">Anterior</string>
+  <string name="survey_fragment_submit_button">Enviar</string>
+  <string name="survey_fragment_free_form_text">Deixe seu feedback aqui</string>
+  <string name="survey_activity_exit_dialog_continue_button">Continuar a pesquisa</string>
+  <string name="survey_activity_exit_dialog_exit_button">Sair</string>
+  <string name="survey_activity_exit_dialog_exit_button_description">Pesquisa de saída</string>
+  <string name="survey_activity_exit_dialog_confirmation_text">Tem certeza de que deseja sair da pesquisa?</string>
+  <string name="survey_activity_exit_dialog_onboarding_text">Seu feedback nos ajuda a atender melhor alunos como você. Gostaria de responder a uma breve pesquisa sobre sua experiência?</string>
+  <string name="survey_activity_welcome_dialog_begin_survey_button">Iniciar pesquisa</string>
+  <string name="survey_activity_welcome_dialog_maybe_later_button">Talvez mais tarde</string>
+  <string name="survey_activity_outer_dialog_thank_you_message">Obrigado por responder à pesquisa. Esperamos que você tenha gostado de usar o %s!</string>
+  <string name="survey_activity_outer_dialog_finish_button">Pesquisa de saída</string>
+  <string name="survey_activity_welcome_dialog_onboarding_title_text">Gostaríamos muito de receber seu feedback!</string>
+  <string name="survey_activity_outer_dialog_onboarding_title_text">Obrigado</string>
+  <string name="survey_activity_nps_score_not_likely_text">0 - Pouco provável</string>
+  <string name="survey_activity_nps_score_extremely_likely_text">10 - Extremamente provável</string>
+  <string name="survey_fragment_user_type_question">Selecione uma das opções a seguir:</string>
+  <string name="survey_fragment_user_type_answer_learner">Eu sou um formando</string>
+  <string name="survey_fragment_user_type_answer_teacher">Eu sou um professor</string>
+  <string name="survey_fragment_user_type_answer_parent">Eu sou um pai</string>
+  <string name="survey_fragment_user_type_answer_other">Outro</string>
+  <string name="survey_fragment_market_fit_question">Como você se sentiria se não pudesse mais usar %s?</string>
+  <string name="survey_fragment_market_fit_answer_very_disappointed">Muito decepcionado</string>
+  <string name="survey_fragment_market_fit_answer_somewhat_disappointed">Um pouco decepcionado</string>
+  <string name="survey_fragment_market_fit_answer_not_disappointed">Não fiquei desapontado</string>
+  <string name="survey_fragment_market_fit_answer_wont_use_oppia">N/A - Não uso mais %s</string>
+  <string name="survey_fragment_nps_promoter_feedback_question">Ficamos felizes que tenha gostado de sua experiência com a %s. Compartilhe o que mais o ajudou:</string>
+  <string name="survey_fragment_nps_passive_feedback_question">Obrigado por responder! Como podemos proporcionar uma experiência melhor?</string>
+  <string name="survey_fragment_nps_detractor_feedback_question">Ajude-nos a melhorar sua experiência! Compartilhe o principal motivo da sua pontuação:</string>
+  <string name="survey_fragment_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="topic_fragment_revision_previous_subtopic_talkback_text">O subtópico anterior é %s</string>
+  <string name="topic_fragment_revision_next_subtopic_talkback_text">O próximo subtópico é %s</string>
 </resources>
diff --git a/app/src/main/res/values-sw/strings.xml b/app/src/main/res/values-sw/strings.xml
index 758c513d8e0..8c5530a2d98 100644
--- a/app/src/main/res/values-sw/strings.xml
+++ b/app/src/main/res/values-sw/strings.xml
@@ -5,146 +5,132 @@
 * VivianW
 -->
 <resources>
-  <string name="nav_header_desc">kichwa cha urambazaji</string>
-  <string name="menu_options">Chaguzi</string>
-  <string name="menu_my_downloads">Vipakuliwa Vyangu</string>
-  <string name="menu_help">Msaada</string>
+  <string name="menu_options_text">Chaguzi</string>
+  <string name="navigation_drawer_fragment_menu_my_downloads_text">Vipakuliwa Vyangu</string>
+  <string name="menu_help_text">Msaada</string>
   <string name="exploration_activity_title">Kicheza Ugunduzi</string>
   <string name="help_activity_title">Msaada</string>
-  <string name="menu_switch_profile">Badili Wasifu</string>
-  <string name="developer_options">Chaguzi za Msanidi</string>
-  <string name="administrator_controls">Vidhibiti vya Msimamizi</string>
-  <string name="drawer_open_content_description">Orodha ya Uelekezaji Fungua</string>
-  <string name="drawer_close_content_description">Orodha ya Uelekezaji Funga</string>
-  <string name="audio_play_description">Cheza Sauti</string>
-  <string name="audio_pause_description">Sitisha sauti</string>
-  <string name="audio_language_select_dialog_okay_button" fuzzy="true">sawa</string>
-  <string name="audio_language_select_dialog_cancel_button">futa</string>
-  <string name="audio_language_select_dialog_title">Lugha ya Sauti</string>
-  <string name="audio_dialog_offline_title">Nje ya Mtandao kwa sasa</string>
-  <string name="audio_dialog_offline_message">Hakikisha kuwa Wi-Fi au data ya mtandao wa simu imewashwa, kisha ujaribu tena.</string>
-  <string name="audio_dialog_offline_positive" fuzzy="true">sawa</string>
-  <string name="cellular_data_alert_dialog_okay_button" fuzzy="true">sawa</string>
-  <string name="cellular_data_alert_dialog_cancel_button">futa</string>
-  <string name="cellular_data_alert_dialog_title">Kwa sasa ipo kwenye Data ya Simu</string>
-  <string name="cellular_data_alert_dialog_description">Kutiririsha sauti kunaweza kutumia data nyingi ya mtandao wa simu.</string>
-  <string name="cellular_data_alert_dialog_checkbox">Usionyeshe ujumbe huu tena</string>
-  <string name="concept_card_toolbar_title">Kadi ya Dhana</string>
-  <string name="revision_card_toolbar_title">Kadi ya Marudio</string>
+  <string name="navigation_drawer_fragment_switch_profile">Badili Wasifu</string>
+  <string name="navigation_drawer_fragment_developer_options">Chaguzi za Msanidi</string>
+  <string name="administrator_controls_activity_title">Vidhibiti vya Msimamizi</string>
+  <string name="navigation_drawer_fragment_open_content_description">Orodha ya Uelekezaji Fungua</string>
+  <string name="navigation_drawer_fragment_close_content_description">Orodha ya Uelekezaji Funga</string>
+  <string name="audio_fragment_play_description">Cheza Sauti</string>
+  <string name="audio_fragment_pause_description">Sitisha sauti</string>
+  <string name="audio_language_dialog_okay_button_text" fuzzy="true">sawa</string>
+  <string name="audio_language_dialog_cancel_button_text">futa</string>
+  <string name="audio_language_dialog_title">Lugha ya Sauti</string>
+  <string name="audio_fragment_offline_dialog_title">Nje ya Mtandao kwa sasa</string>
+  <string name="audio_fragment_offline_dialog_message">Hakikisha kuwa Wi-Fi au data ya mtandao wa simu imewashwa, kisha ujaribu tena.</string>
+  <string name="audio_fragment_offline_dialog_positive_button_text" fuzzy="true">sawa</string>
+  <string name="cellular_audio_dialog_okay_button_text" fuzzy="true">sawa</string>
+  <string name="cellular_audio_dialog_cancel_button_text">futa</string>
+  <string name="cellular_audio_dialog_title">Kwa sasa ipo kwenye Data ya Simu</string>
+  <string name="cellular_audio_dialog_description">Kutiririsha sauti kunaweza kutumia data nyingi ya mtandao wa simu.</string>
+  <string name="cellular_audio_dialog_checkboxes_text">Usionyeshe ujumbe huu tena</string>
+  <string name="concept_card_fragment_title">Kadi ya Dhana</string>
   <string name="unsaved_exploration_dialog_title">Je, ungependa kwenda kwenye Ukurasa wa Mada?</string>
   <string name="unsaved_exploration_dialog_description">Maendeleo yako hayatahifadhiwa.</string>
-  <string name="unsaved_exploration_dialog_leave_button">Toka</string>
-  <string name="unsaved_exploration_dialog_cancel_button">Futa</string>
+  <string name="unsaved_exploration_dialog_leave_button_text">Toka</string>
+  <string name="unsaved_exploration_dialog_cancel_button_text">Futa</string>
   <string name="stop_exploration_dialog_title">Je, ungependa kwenda kwenye Ukurasa wa Mada?</string>
   <string name="stop_exploration_dialog_description">Maendeleo yako hayatahifadhiwa.</string>
-  <string name="stop_exploration_dialog_cancel_button">Futa</string>
-  <string name="stop_exploration_dialog_leave_button">Toka</string>
-  <string name="progress_database_full_dialog_title">Kiwango cha juu zaidi cha kuhifadhi kimefikiwa</string>
-  <string name="progress_database_full_dialog_description">Maendeleo yaliyohifadhiwa ya somo \"%s\" yatafutwa.</string>
-  <string name="progress_database_full_dialog_continue_button">Endelea</string>
-  <string name="progress_database_full_dialog_leave_without_saving_progress_button">Ondoka bila kuhifadhi maendeleo</string>
-  <string name="progress_database_full_dialog_back_to_lesson_button">Rudi kwenye somo</string>
-  <string name="topic_practice_master_these_skills">jifunze ujuzi huu.</string>
-  <string name="topic_name_text_view">Uwiano na Uwiano wa Sababu</string>
-  <string name="topic_practice_skills_description">Chagua ujuzi ambao ungependa kufanyia mazoezi.</string>
-  <string name="topic_practice_start">Anza</string>
-  <string name="state_continue_button">Endelea</string>
-  <string name="state_continue_submit">Wasilisha</string>
-  <string name="previous_state_description">Nenda kwenye kadi iliyotangulia</string>
-  <string name="next_state_description">Nenda kwenye kadi iliyofuata</string>
-  <string name="state_submit_button">Wasilisha</string>
-  <string name="lesson_replay_button_text">Cheza tena</string>
-  <string name="state_end_exploration_button">Rudi kwa Mada iliopita</string>
-  <string name="previous_responses_header">Majibu ya awali (%s)</string>
-  <string name="image_interaction_answer_text">Mibofyo kwenye %s</string>
-  <string name="state_learn_again_button">Jifunze Tena</string>
-  <string name="see_more">Ona zaidi</string>
-  <string name="see_less">ona kidogo</string>
-  <string name="FAQs">Maswali Yanayoulizwa Mara kwa Mara</string>
-  <string name="featured_questions">Maswali Yanayoangaziwa</string>
-  <string name="frequently_asked_questions">maswali yanayoulizwa mara kwa mara</string>
+  <string name="stop_exploration_dialog_cancel_button_text">Futa</string>
+  <string name="stop_exploration_dialog_leave_button_text">Toka</string>
+  <string name="stop_exploration_dialog_progress_full_title">Kiwango cha juu zaidi cha kuhifadhi kimefikiwa</string>
+  <string name="stop_exploration_dialog_progress_full_description">Maendeleo yaliyohifadhiwa ya somo \"%s\" yatafutwa.</string>
+  <string name="stop_exploration_dialog_progress_full_continue_button">Endelea</string>
+  <string name="stop_exploration_dialog_progress_full_without_saving_button">Ondoka bila kuhifadhi maendeleo</string>
+  <string name="stop_exploration_dialog_progress_full_back_to_lesson_button">Rudi kwenye somo</string>
+  <string name="topic_fragment_practice_master_skills_text">jifunze ujuzi huu.</string>
+  <string name="topic_fragment_practice_skills_description">Chagua ujuzi ambao ungependa kufanyia mazoezi.</string>
+  <string name="topic_fragment_practice_start_button">Anza</string>
+  <string name="state_fragment_continue_button_text">Endelea</string>
+  <string name="state_fragment_previous_state_button_description">Nenda kwenye kadi iliyotangulia</string>
+  <string name="state_fragment_next_state_button_description">Nenda kwenye kadi iliyofuata</string>
+  <string name="state_fragment_submit_button_text">Wasilisha</string>
+  <string name="state_fragment_replay_button_text">Cheza tena</string>
+  <string name="state_fragment_return_to_topic_button_text">Rudi kwa Mada iliopita</string>
+  <string name="state_fragment_previous_responses_header">Majibu ya awali (%s)</string>
+  <string name="state_fragment_image_interaction_answer_text">Mibofyo kwenye %s</string>
+  <string name="topic_fragment_info_see_more_text">Ona zaidi</string>
+  <string name="topic_fragment_info_see_less_text">ona kidogo</string>
+  <string name="faq_list_activity_title">Maswali Yanayoulizwa Mara kwa Mara</string>
+  <string name="faq_list_activity_item_header_text">Maswali Yanayoangaziwa</string>
   <string name="faq_activity_title">maswali yanayoulizwa mara kwa mara</string>
   <string name="pin_password_activity_title">Uthibitishaji wa nambari ya siri</string>
   <string name="onboarding_activity_title">Utangulizi</string>
-  <string name="frequently_asked_questions_FAQ">maswali yanayoulizwa mara kwa mara</string>
-  <string name="info">habari</string>
-  <string name="lessons">Masomo</string>
-  <string name="practice">Mazoezi</string>
-  <string name="revision">Mazoezi</string>
-  <string name="administrator_controls_title">Vidhibiti vya Msimamizi</string>
-  <string name="topic_page">Ukurasa wa mada</string>
-  <string name="topic_name">mada: %s</string>
-  <string name="topic">mada</string>
+  <string name="help_activity_faq_text">maswali yanayoulizwa mara kwa mara</string>
+  <string name="topic_fragment_info">habari</string>
+  <string name="topic_fragment_lessons">Masomo</string>
+  <string name="topic_fragment_practice">Mazoezi</string>
+  <string name="topic_fragment_revision">Mazoezi</string>
+  <string name="topic_activity_title">Ukurasa wa mada</string>
+  <string name="topic_fragment_name_text">mada: %s</string>
   <string name="ongoing_topic_list_activity_title">mada zinazoendelea</string>
-  <string name="chapter_name">Sura ya %s: %s</string>
-  <string name="chapter_completed">Sura ya %s yenye kichwa %s imekamilika</string>
-  <string name="chapter_in_progress">Sura ya %s yenye kichwa %s inaendelea</string>
-  <string name="chapter_prerequisite_title_label">Kamilisha Sura ya %s: %s ili kufungua sura hii.</string>
-  <string name="text_input_default_content_description">Ingiza maandishi.</string>
-  <string name="fractions_default_hint_text">Ingiza sehemu katika mpangilio huu x/x, au nambari iliyochanganywa katika mpangilio huu x/x.</string>
-  <string name="fractions_default_hint_text_no_integer">Ingiza sehemu katika mpangilio huu X/X.</string>
-  <string name="numeric_input_hint">Weka nambari.</string>
-  <string name="number_with_units_input_hint_text">Andika Nambari za vitengo hapa.</string>
-  <string name="numeric_expression_default_hint_text">Andika hesabu hapa,tumia nambari peke yake.</string>
-  <string name="algebraic_expression_default_hint_text">Andika swali la hesabu hapa.</string>
-  <string name="math_equation_default_hint_text">Andika hesabu ya kulinganisha hapa.</string>
-  <string name="math_expression_error_spaces_in_numerical_input">Tafadhali ondoa nafasi katikati ya nambari katika jibu lako.</string>
-  <string name="math_expression_error_unbalanced_parentheses">Tafadhali funga au uondoe mabano.</string>
-  <string name="math_expression_error_single_redundant_parentheses">Tafadhali ondoa mabano karibu na jibu mzima: \' %s\'.</string>
-  <string name="math_expression_error_multiple_redundant_parentheses">Tafadhali ondoa mabano ya ziada karibu na \'(%1$s)\', kwa mfano: \'% 1 $ s\'.</string>
-  <string name="math_expression_error_redundant_parentheses_individual_term">Tafadhali ondoa mabano ya ziada karibu na \'(%1$s)\', kwa mfano: \'% 1 $ s\'.</string>
-  <string name="math_expression_error_unnecessary_symbols">Kuna\'%s\' isiyo halali katika jibu. Tafadhali ondoa.</string>
-  <string name="math_expression_error_number_after_var_term">Tafadhali panga upya utaratibu wa % %1$s &amp; %2$s. Kwa mfano:% $ 2% $ s.</string>
-  <string name="math_expression_error_consecutive_binary_operators">%1$s na % $%2$s inapaswa kutengwa na nambari au kitu tofauti.</string>
-  <string name="math_expression_error_consecutive_unary_operators">Tafadhali ondoa alama za ziada katika jibu lako.</string>
-  <string name="math_expression_error_missing_lhs_for_addition_operator">Je! Kuna idadi au kitu tofauti inayokosa kabla au baada ya ishara ya kuongeza \'%1$s\'? Ikiwa sivyo, tafadhali ondoa\'% 1 $ s\' ya ziada.</string>
-  <string name="math_expression_error_missing_lhs_for_multiplication_operator">Je, kuna nambari au kitu tofauti inayokosa kabla au baada ya ishara ya kuzidisha \'%1$s\'? Ikiwa sivyo, tafadhali ondoa \'% 1 $ s\' ya ziada.</string>
-  <string name="math_expression_error_missing_lhs_for_division_operator">Je, kuna idadi au kitu tofauti inayokosa kabla au baada ya ishara ya mgawanyiko \'%1$s\'? Ikiwa sivyo, tafadhali ondoa\'% 1 $ s\' ya ziada.</string>
-  <string name="math_expression_error_missing_lhs_for_exponentiation_operator">Je! Kuna idadi au kitu tofauti inayokosa kabla au baada ya ishara ya ufafanuzi\'%1$s\'? Ikiwa sivyo, tafadhali ondoa \'%1$s\' ya ziada.</string>
-  <string name="math_expression_error_missing_rhs_for_addition_operator">Inaonekana kuwa nambari au kitu tofauti inakosa baada ya alama ya kuongeza \'%s\'.</string>
-  <string name="math_expression_error_missing_rhs_for_subtraction_operator">Inaonekana kuwa nambari au kitu tofauti inakosekana baada ya ishara ya kuondoa \'%s\'.</string>
-  <string name="math_expression_error_missing_rhs_for_multiplication_operator">Inaonekana kuwa nambari au kitu tofauti haipo baada ya ishara ya kuzidisha \'%s\'.</string>
-  <string name="math_expression_error_missing_rhs_for_division_operator">Inaonekana kuwa nambari au kitu tofauti haipo baada ya ishara ya kugawanya \'%s\'.</string>
-  <string name="math_expression_error_missing_rhs_for_exponentiation_operator">Inaonekana kuwa nambari au kitu tofauti haipo baada ya ishara ya ufafanuzi \'%s\'.</string>
-  <string name="math_expression_error_exponent_has_variable">Samahani,vipeo vingi havitumiki na programu.Tafadhali rekebisha jibu lako.</string>
-  <string name="math_expression_error_exponent_too_large">Samahani, nguvu za juu zaidi ya 5 haiungwi mkono na programu. Tafadhali rekebisha jibu lako.</string>
-  <string name="math_expression_error_nested_exponent">Samahani, nguvu zinazorudiwa/vielezo hazihimiliwi na programu. Tafadhali punguza jibu lako kwa nguvu moja.</string>
-  <string name="math_expression_error_hanging_square_root">Pembejeo haipo kwa mzizi wa mraba.</string>
-  <string name="math_expression_error_term_divided_by_zero">Kugawanya kwa sufuri si halali. Tafadhali rekebisha jibu lako.</string>
-  <string name="math_expression_error_variable_in_numeric_expression">Inaonekana umeingiza baadhi ya vigezo. Tafadhali hakikisha kuwa jibu lako lina nambari pekee na uondoe vigezo vyovyote kutoka kwa jibu lako.</string>
-  <string name="math_expression_error_invalid_variable">Tafadhali tumia vigezo vilivyobainishwa katika swali na si %s.</string>
-  <string name="math_expression_error_missing_equals">Mlinganyo yako inakosa ishara \'=\'.</string>
-  <string name="math_expression_error_more_than_one_equals">Mlinganyo wako una ishara nyingi sana \'=\'. Inapaswa kuwa na moja tu.</string>
-  <string name="math_expression_error_hanging_equals">Moja ya pande za \'=\' katika mlinganyo wako ni tupu.</string>
-  <string name="math_expression_error_unsupported_function">Chaguo la kukokotoa \'%s\' haitumiki. Tafadhali rekebisha jibu lako.</string>
-  <string name="math_expression_error_incomplete_function_name">Ulimaanisha sqrt? Ikiwa sivyo, tafadhali tenganisha vigeu kwa kutumia alama za kuzidisha.</string>
-  <string name="math_expression_error_generic">Samahani, hatukuweza kuelewa jibu lako. Tafadhali iangalie ili kuhakikisha kuwa hakuna hitilafu zozote.</string>
-  <string name="enable_audio_playback_content_description">Washa sauti kwa somo hili.</string>
-  <string name="recently_played_stories">Hadithi Zilizochezwa hivi karibuni</string>
-  <string name="last_played_stories">Hadithi Zilizochezwa Mwisho</string>
-  <string name="view_all">Tazama zote</string>
-  <string name="ongoing_story_last_week">zilizochezwa ndani ya Wiki Iliyopita</string>
-  <string name="ongoing_story_last_month">zilizochezwa ndani ya Mwezi uliopita</string>
+  <string name="topic_fragment_lessons_chapter_play_name_text">Sura ya %s: %s</string>
+  <string name="topic_fragment_lessons_chapter_completed_text">Sura ya %s yenye kichwa %s imekamilika</string>
+  <string name="topic_fragment_lessons_chapter_in_progress_text">Sura ya %s yenye kichwa %s inaendelea</string>
+  <string name="topic_fragment_lessons_chapter_prerequisite_label">Kamilisha Sura ya %s: %s ili kufungua sura hii.</string>
+  <string name="state_fragment_text_input_interaction_content_description">Ingiza maandishi.</string>
+  <string name="state_fragment_fraction_input_interaction_hint">Ingiza sehemu katika mpangilio huu x/x, au nambari iliyochanganywa katika mpangilio huu x/x.</string>
+  <string name="state_fragment_fraction_input_interaction_no_integer_hint">Ingiza sehemu katika mpangilio huu X/X.</string>
+  <string name="state_fragment_numeric_input_interaction_hint">Weka nambari.</string>
+  <string name="state_fragment_numeric_input_interaction_default_hint">Andika hesabu hapa,tumia nambari peke yake.</string>
+  <string name="state_fragment_algebraic_input_interaction_default_hint">Andika swali la hesabu hapa.</string>
+  <string name="state_fragment_math_equation_default_hint">Andika hesabu ya kulinganisha hapa.</string>
+  <string name="state_fragment_math_expression_space_error">Tafadhali ondoa nafasi katikati ya nambari katika jibu lako.</string>
+  <string name="state_fragment_math_expression_unbalanced_parentheses_error">Tafadhali funga au uondoe mabano.</string>
+  <string name="state_fragment_math_expression_single_redundant_parentheses_error">Tafadhali ondoa mabano karibu na jibu mzima: \' %s\'.</string>
+  <string name="state_fragment_math_expression_multiple_redundant_parentheses_error">Tafadhali ondoa mabano ya ziada karibu na \'(%1$s)\', kwa mfano: \'% 1 $ s\'.</string>
+  <string name="state_fragment_math_expression_individual_redundant_parentheses_error">Tafadhali ondoa mabano ya ziada karibu na \'(%1$s)\', kwa mfano: \'% 1 $ s\'.</string>
+  <string name="state_fragment_math_expression_unnecessary_symbols_error">Kuna\'%s\' isiyo halali katika jibu. Tafadhali ondoa.</string>
+  <string name="state_fragment_math_expression_number_after_var_error">Tafadhali panga upya utaratibu wa % %1$s &amp; %2$s. Kwa mfano:% $ 2% $ s.</string>
+  <string name="state_fragment_math_expression_consecutive_binary_operators_error">%1$s na % $%2$s inapaswa kutengwa na nambari au kitu tofauti.</string>
+  <string name="state_fragment_math_expression_consecutive_unary_operators_error">Tafadhali ondoa alama za ziada katika jibu lako.</string>
+  <string name="state_fragment_math_expression_missing_lhs_for_addition_error">Je! Kuna idadi au kitu tofauti inayokosa kabla au baada ya ishara ya kuongeza \'%1$s\'? Ikiwa sivyo, tafadhali ondoa\'% 1 $ s\' ya ziada.</string>
+  <string name="state_fragment_math_expression_missing_lhs_for_multiplication_error">Je, kuna nambari au kitu tofauti inayokosa kabla au baada ya ishara ya kuzidisha \'%1$s\'? Ikiwa sivyo, tafadhali ondoa \'% 1 $ s\' ya ziada.</string>
+  <string name="state_fragment_math_expression_missing_lhs_for_division_error">Je, kuna idadi au kitu tofauti inayokosa kabla au baada ya ishara ya mgawanyiko \'%1$s\'? Ikiwa sivyo, tafadhali ondoa\'% 1 $ s\' ya ziada.</string>
+  <string name="state_fragment_math_expression_missing_lhs_for_exponentiation_error">Je! Kuna idadi au kitu tofauti inayokosa kabla au baada ya ishara ya ufafanuzi\'%1$s\'? Ikiwa sivyo, tafadhali ondoa \'%1$s\' ya ziada.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_addition_error">Inaonekana kuwa nambari au kitu tofauti inakosa baada ya alama ya kuongeza \'%s\'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_subtraction_error">Inaonekana kuwa nambari au kitu tofauti inakosekana baada ya ishara ya kuondoa \'%s\'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_multiplication_error">Inaonekana kuwa nambari au kitu tofauti haipo baada ya ishara ya kuzidisha \'%s\'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_division_error">Inaonekana kuwa nambari au kitu tofauti haipo baada ya ishara ya kugawanya \'%s\'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_exponentiation_error">Inaonekana kuwa nambari au kitu tofauti haipo baada ya ishara ya ufafanuzi \'%s\'.</string>
+  <string name="state_fragment_math_expression_exponent_has_variable_error">Samahani,vipeo vingi havitumiki na programu.Tafadhali rekebisha jibu lako.</string>
+  <string name="state_fragment_math_expression_exponent_too_large_error">Samahani, nguvu za juu zaidi ya 5 haiungwi mkono na programu. Tafadhali rekebisha jibu lako.</string>
+  <string name="state_fragment_math_expression_nested_exponent_error">Samahani, nguvu zinazorudiwa/vielezo hazihimiliwi na programu. Tafadhali punguza jibu lako kwa nguvu moja.</string>
+  <string name="state_fragment_math_expression_hanging_square_root_error">Pembejeo haipo kwa mzizi wa mraba.</string>
+  <string name="state_fragment_math_expression_divided_by_zero_error">Kugawanya kwa sufuri si halali. Tafadhali rekebisha jibu lako.</string>
+  <string name="state_fragment_math_expression_variable_in_numeric_error">Inaonekana umeingiza baadhi ya vigezo. Tafadhali hakikisha kuwa jibu lako lina nambari pekee na uondoe vigezo vyovyote kutoka kwa jibu lako.</string>
+  <string name="state_fragment_math_expression_invalid_variable_error">Tafadhali tumia vigezo vilivyobainishwa katika swali na si %s.</string>
+  <string name="state_fragment_math_expression_missing_equals_error">Mlinganyo yako inakosa ishara \'=\'.</string>
+  <string name="state_fragment_math_expression_more_than_one_equals_error">Mlinganyo wako una ishara nyingi sana \'=\'. Inapaswa kuwa na moja tu.</string>
+  <string name="state_fragment_math_expression_hanging_equals_error">Moja ya pande za \'=\' katika mlinganyo wako ni tupu.</string>
+  <string name="state_fragment_math_expression_unsupported_function_error">Chaguo la kukokotoa \'%s\' haitumiki. Tafadhali rekebisha jibu lako.</string>
+  <string name="state_fragment_math_expression_incomplete_function_name_error">Ulimaanisha sqrt? Ikiwa sivyo, tafadhali tenganisha vigeu kwa kutumia alama za kuzidisha.</string>
+  <string name="state_fragment_math_expression_generic_error">Samahani, hatukuweza kuelewa jibu lako. Tafadhali iangalie ili kuhakikisha kuwa hakuna hitilafu zozote.</string>
+  <string name="home_activity_recently_played_stories">Hadithi Zilizochezwa hivi karibuni</string>
+  <string name="home_activity_last_played_stories">Hadithi Zilizochezwa Mwisho</string>
+  <string name="home_activity_view_all_text">Tazama zote</string>
+  <string name="home_activity_ongoing_story_last_week">zilizochezwa ndani ya Wiki Iliyopita</string>
+  <string name="home_activity_ongoing_story_last_month">zilizochezwa ndani ya Mwezi uliopita</string>
   <string name="story_activity_title">Orodha ya Sura</string>
-  <string name="lesson_thumbnail_content_description">Picha ya %s</string>
-  <string name="stories_you_can_play">Hadithi Unazoweza Kucheza</string>
-  <string name="navigate_up">Nenda juu/enda juu</string>
-  <string name="recently_played_activity">Hadithi Zilizochezwa Hivi Karibuni</string>
-  <string name="topic_downloaded">Mada Imepakuliwa</string>
-  <string name="downloaded">Imepakuliwa</string>
-  <string name="question_player_title">Hali ya Mazoezi</string>
-  <string name="question_training_session_progress">Swali %s kati ya %s</string>
-  <string name="question_training_session_progress_finished">imekamilika</string>
-  <string name="question_training_session_finished_header">imekamilika</string>
-  <string name="question_training_session_finished_message">Umemaliza maswali yote! Unaweza kuchagua kucheza seti nyingine ya maswali, au kurudi kwenye mada.</string>
-  <string name="status_in_progress">Inaendelea</string>
-  <string name="status_completed">Imekamilika</string>
-  <string name="show_chapter_list">Onyesha orodha ya sura</string>
-  <string name="hide_chapter_list">Ficha orodha ya sura</string>
-  <string name="play_pause_audio">Cheza/Sitisha Sauti</string>
-  <string name="preferences">Mapendeleo</string>
+  <string name="home_activity_lesson_thumbnail_description">Picha ya %s</string>
+  <string name="home_activity_topic_play_text">Hadithi Unazoweza Kucheza</string>
+  <string name="navigate_up_text">Nenda juu/enda juu</string>
+  <string name="recently_played_activity_title">Hadithi Zilizochezwa Hivi Karibuni</string>
+  <string name="topic_fragment_info_topic_downloaded">Mada Imepakuliwa</string>
+  <string name="exploration_activity_question_player_title">Hali ya Mazoezi</string>
+  <string name="topic_fragment_question_training_session_progress">Swali %s kati ya %s</string>
+  <string name="topic_fragment_question_training_session_progress_finished">imekamilika</string>
+  <string name="topic_fragment_question_end_session_header_text">imekamilika</string>
+  <string name="topic_fragment_question_end_session_body_text">Umemaliza maswali yote! Unaweza kuchagua kucheza seti nyingine ya maswali, au kurudi kwenye mada.</string>
+  <string name="topic_fragment_lessons_story_status_in_progress">Inaendelea</string>
+  <string name="topic_fragment_lessons_story_status_completed">Imekamilika</string>
+  <string name="topic_fragment_lessons_show_chapter_list">Onyesha orodha ya sura</string>
+  <string name="topic_fragment_lessons_hide_chapter_list">Ficha orodha ya sura</string>
   <string name="profile_progress_activity_title">Ukurasa wa Maendeleo</string>
-  <string name="search">Tafuta</string>
   <string name="fraction_error_invalid_chars">Tafadhali tumia nambari, nafasi au mikwaruzo ya mbele (/) pekee.</string>
   <string name="fraction_error_invalid_format">Tafadhali weka sehemu halali (k.m., 5/3 au 1 2/3)</string>
   <string name="fraction_error_divide_by_zero">Tafadhali usiweke 0 kwenye denominator</string>
@@ -163,7 +149,6 @@
   <string name="size_mb">%s MB</string>
   <string name="size_gb">%s GB</string>
   <string name="correct">Sahihi!</string>
-  <string name="topic_prefix">Mada: %s</string>
   <plurals name="chapter_count" fuzzy="true">
     <item quantity="one">Sura 1</item>
     <item quantity="other">Sura %s</item>
@@ -180,237 +165,224 @@
     <item quantity="one">Somo 1</item>
     <item quantity="other">Masomo %s</item>
   </plurals>
-  <string name="profile_chooser_activity_label">Ukurasa wa kuchagua wasifu</string>
-  <string name="profile_chooser_admin">Msimamizi</string>
-  <string name="profile_chooser_select">Chagua wasifu wako</string>
-  <string name="profile_chooser_add">Ongeza Wasifu</string>
-  <string name="set_up_multiple_profiles">Weka Wasifu Nyingi</string>
-  <string name="set_up_multiple_profiles_description">Ongeza hadi watumiaji 10 kwenye akaunti yako. Nzuri sana kwa familia na madarasa.</string>
-  <string name="profile_chooser_administrator_controls">Udhibiti vya Msimamizi</string>
-  <string name="profile_chooser_language">Lugha</string>
-  <string name="admin_auth_toolbar">Vidhibiti vya Msimamizi</string>
+  <string name="profile_chooser_activity_title">Ukurasa wa kuchagua wasifu</string>
+  <string name="profile_chooser_fragment_admin_text">Msimamizi</string>
+  <string name="profile_chooser_fragment_select_text">Chagua wasifu wako</string>
+  <string name="profile_chooser_fragment_add_text">Ongeza Wasifu</string>
+  <string name="profile_chooser_fragment_set_up_multiple_profiles">Weka Wasifu Nyingi</string>
+  <string name="profile_chooser_fragment_add_profile_description_text">Ongeza hadi watumiaji 10 kwenye akaunti yako. Nzuri sana kwa familia na madarasa.</string>
+  <string name="profile_chooser_fragment_administrator_controls_text">Udhibiti vya Msimamizi</string>
+  <string name="profile_chooser_fragment_language_text">Lugha</string>
+  <string name="admin_auth_activity_title">Vidhibiti vya Msimamizi</string>
   <string name="admin_auth_activity_add_profiles_title">Idhinisha kuongeza wasifu</string>
   <string name="admin_auth_activity_access_controls_title">Idhinisha kufikia Vidhibiti vya Msimamizi</string>
-  <string name="admin_auth_heading">Idhini ya Msimamizi Inahitajika</string>
-  <string name="admin_auth_sub">Weka Nambari ya Siri ya Msimamizi ili kuunda akaunti mpya.</string>
-  <string name="admin_auth_admin_controls_sub">Weka Nambari ya Siri ya Msimamizi ili kufikia Vidhibiti vya Msimamizi.</string>
-  <string name="admin_auth_pin">Nambari ya Siri ya Msimamizi</string>
-  <string name="admin_auth_incorrect">Nambari ya Siri ya Msimamizi si Sahihi. Tafadhali jaribu tena.</string>
-  <string name="admin_auth_null">Tafadhali weka Nambari ya Siri ya Msimamizi.</string>
-  <string name="admin_auth_submit">Wasilisha</string>
-  <string name="admin_auth_close">Funga</string>
-  <string name="admin_pin_requirement_description" fuzzy="true">Kabla ya kuongeza wasifu, tunahitaji kulinda akaunti yako kwa kuunda Nambari ya Siri. Hii hukupa uwezo wa kuidhinisha upakuaji na kudhibiti wasifu kwenye kifaa.</string>
-  <string name="admin_pin_pin_description">Tumia Nambari yako ya siri uliyoweka kwa akaunti za kibinafsi kama vile benki au usalama wa kijamii.</string>
-  <string name="admin_pin_new_pin">Nambari mpya ya Siri ya tarakimu 5</string>
-  <string name="admin_pin_new_confirm">Thibitisha Nambari ya Siri ya tarakimu 5</string>
-  <string name="admin_pin_error_pin_length">Nambari yako ya Siri inapaswa kuwa na urefu wa tarakimu 5.</string>
-  <string name="admin_pin_error_pin_confirm_wrong">Tafadhali hakikisha kwamba Nambari za Siri zote mbili zinalingana.</string>
-  <string name="save">Hifadhi</string>
+  <string name="admin_auth_activity_heading_text">Idhini ya Msimamizi Inahitajika</string>
+  <string name="admin_auth_activity_subheading_text">Weka Nambari ya Siri ya Msimamizi ili kuunda akaunti mpya.</string>
+  <string name="admin_auth_activity_controls_subheading_text">Weka Nambari ya Siri ya Msimamizi ili kufikia Vidhibiti vya Msimamizi.</string>
+  <string name="admin_auth_activity_input_pin_hint_text">Nambari ya Siri ya Msimamizi</string>
+  <string name="admin_auth_activity_incorrect_pin_label">Nambari ya Siri ya Msimamizi si Sahihi. Tafadhali jaribu tena.</string>
+  <string name="admin_auth_activity_null_pin_input_label">Tafadhali weka Nambari ya Siri ya Msimamizi.</string>
+  <string name="admin_auth_activity_submit_button_text">Wasilisha</string>
+  <string name="admin_auth_activity_tool_bar_content_desc">Funga</string>
+  <string name="admin_pin_activity_requirement_description_text" fuzzy="true">Kabla ya kuongeza wasifu, tunahitaji kulinda akaunti yako kwa kuunda Nambari ya Siri. Hii hukupa uwezo wa kuidhinisha upakuaji na kudhibiti wasifu kwenye kifaa.</string>
+  <string name="admin_pin_activity_warning_text">Tumia Nambari yako ya siri uliyoweka kwa akaunti za kibinafsi kama vile benki au usalama wa kijamii.</string>
+  <string name="admin_pin_activity_input_new_pin_hint">Nambari mpya ya Siri ya tarakimu 5</string>
+  <string name="admin_pin_activity_input_confirm_pin_hint">Thibitisha Nambari ya Siri ya tarakimu 5</string>
+  <string name="admin_pin_activity_pin_length_error">Nambari yako ya Siri inapaswa kuwa na urefu wa tarakimu 5.</string>
+  <string name="admin_pin_activity_wrong_pin_text">Tafadhali hakikisha kwamba Nambari za Siri zote mbili zinalingana.</string>
+  <string name="admin_pin_activity_submit_button_text">Hifadhi</string>
   <string name="admin_pin_activity_title">Idhinisha kuongeza wasifu</string>
-  <string name="add_profile_activity_label">Ongeza Wasifu</string>
-  <string name="add_profile_title">Ongeza Wasifu</string>
-  <string name="add_profile_input_name" fuzzy="true">Jina</string>
-  <string name="add_profile_input_pin" fuzzy="true">Nambari ya Siri ya tarakimu 3</string>
-  <string name="add_profile_input_confirm_pin">Thibitisha Nambari ya Siri ya tarakimu 3</string>
-  <string name="add_profile_allow_download_heading">Ruhusu Upakuaji wa Ufikiaji</string>
-  <string name="add_profile_allow_download_sub">Mtumiaji anaweza kupakua na kufuta maudhui bila Nambari ya Siri ya Msimamizi.</string>
-  <string name="add_profile_create_btn">Anzisha</string>
-  <string name="add_profile_close">Funga</string>
-  <string name="add_profile_pin_info">Ukiwa na Nambari ya Siri, hakuna mtu mwingine anayeweza kufikia wasifu kando na mtumiaji huyu aliyekabidhiwa.</string>
-  <string name="add_profile_error_image_failed_store">Tumeshindwa kuhifadhi picha yako. Tafadhali jaribu tena.</string>
-  <string name="add_profile_error_name_not_unique">Jina hili tayari linatumiwa na wasifu mwingine.</string>
-  <string name="add_profile_error_name_empty" fuzzy="true">Tafadhali weka jina la wasifu huu.</string>
-  <string name="add_profile_error_name_only_letters" fuzzy="true">Majina yanaweza kuwa na herufi pekee. Jaribu jina lingine?</string>
-  <string name="add_profile_error_pin_length">Nambari yako ya Siri inapaswa kuwa na urefu wa tarakimu 3.</string>
-  <string name="add_profile_error_pin_confirm_wrong">Tafadhali hakikisha kwamba Nambari za Siri zote mbili zinalingana.</string>
-  <string name="add_profile_info_content_description">Maelezo zaidi kuhusu Nambari za Siri zenye tarakimu 3.</string>
-  <string name="current_profile_picture_content_description">Picha ya sasa ya wasifu</string>
-  <string name="edit_profile_picture_content_description">Hariri picha ya wasifu</string>
-  <string name="onboarding_slide_0_title">Karibu kwa %s!</string>
-  <string name="onboarding_slide_0_description">Jifunze chochote unachotaka kwa njia bora na ya kufurahisha.</string>
-  <string name="onboarding_slide_1_title">Ongeza watumiaji kwenye akaunti yako.</string>
-  <string name="onboarding_slide_1_description">Elezea uzoefu na uunde hadi wasifu 10.</string>
-  <string name="onboarding_slide_2_title">Pakua ya nje ya mtandao.</string>
-  <string name="onboarding_slide_2_description">Endelea kujifunza masomo yako bila muunganisho wa mtandao.</string>
-  <string name="onboarding_slide_3_title">Furahia!</string>
-  <string name="onboarding_slide_3_description">Furahia matukio yako ya kujifunza kwa masomo yetu ya bure na ya ufanisi.</string>
-  <string name="skip">Ruka</string>
-  <string name="next_arrow">Inayofuata</string>
-  <string name="get_started">Anza</string>
-  <string name="onboarding_slide_dots_content_description">Slaidi %s ya %s</string>
-  <string name="pin_password_hello">Habari, %s!</string>
-  <string name="pin_password_admin_enter">Tafadhali weka Nambari yako ya Siri ya Msimamizi.</string>
-  <string name="pin_password_user_enter">Tafadhali weka Nambari yako ya Siri.</string>
-  <string name="input_pin_password_as_admin">Nambari ya Siri ya Tarakimu 5 ya Msimamizi.</string>
-  <string name="input_pin_password_as_user">Nambari ya Siri ya Tarakimu 3 ya Mtumiaji.</string>
-  <string name="pin_password_forgot_pin" fuzzy="true">Nilisahau nambari yangu.</string>
-  <string name="pin_password_incorrect_pin">Nambari ya Siri si sahihi.</string>
-  <string name="pin_password_show">Onyesha</string>
-  <string name="pin_password_hide">ficha</string>
-  <string name="pin_password_close">Funga</string>
-  <string name="pin_password_success">Mabadiliko ya Nambari ya Siri yamefaulu</string>
-  <string name="pin_password_forgot_title">Je, umesahau Nambari ya Siri?</string>
-  <string name="admin_forgot_pin_message" fuzzy="true">Ili kuweka upya Nambari yako ya Siri, tafadhali ondoa %s kisha uisakinishe upya.\n\nKumbuka kwamba ikiwa kifaa hakijakuwa mtandaoni, unaweza kupoteza maendeleo ya mtumiaji kwenye akaunti nyingi.</string>
-  <string name="show_hide_password_icon">Onyesha/Ficha ishara ya nenosiri</string>
-  <string name="password_shown_icon">Ishara ya nenosiri iliyoonyeshwa</string>
-  <string name="password_hidden_icon">Ishara ya nenosiri iliyofichwa</string>
-  <string name="enter_your_pin">Weka Nambari yako ya Siri</string>
-  <string name="pin_password_toolbar_title">Weka Nambari ya Siri</string>
-  <string name="admin_settings_label">Nambari ya Siri ya Msimamizi</string>
-  <string name="admin_settings_heading">Ufikiaji wa mipangilio ya msimamizi</string>
-  <string name="admin_settings_sub">Nambari ya Siri ya Msimamizi inahitajika ili kubadilisha Nambari ya Siri ya mtumiaji</string>
-  <string name="admin_settings_cancel">Ghairi</string>
-  <string name="admin_settings_submit">Wasilisha</string>
-  <string name="admin_settings_incorrect">Nambari ya Siri ya msimamizi si Sahihi. Tafadhali jaribu tena.</string>
-  <string name="admin_settings_enter_user_new_pin">Nambari ya Siri mpya ya %1$s.</string>
-  <string name="reset_pin_enter">Weka Nambari mpya ya Siri</string>
+  <string name="add_profile_activity_title">Ongeza Wasifu</string>
+  <string name="add_profile_activity_input_name_hint" fuzzy="true">Jina</string>
+  <string name="add_profile_activity_input_pin_hint" fuzzy="true">Nambari ya Siri ya tarakimu 3</string>
+  <string name="add_profile_activity_input_confirm_pin_hint">Thibitisha Nambari ya Siri ya tarakimu 3</string>
+  <string name="add_profile_activity_allow_download_text">Ruhusu Upakuaji wa Ufikiaji</string>
+  <string name="add_profile_activity_allow_download_sub_text">Mtumiaji anaweza kupakua na kufuta maudhui bila Nambari ya Siri ya Msimamizi.</string>
+  <string name="add_profile_activity_create_button_text">Anzisha</string>
+  <string name="add_profile_activity_close_dialog_text">Funga</string>
+  <string name="add_profile_activity_pin_info_dialog_text">Ukiwa na Nambari ya Siri, hakuna mtu mwingine anayeweza kufikia wasifu kando na mtumiaji huyu aliyekabidhiwa.</string>
+  <string name="add_profile_activity_name_not_unique_error_text">Jina hili tayari linatumiwa na wasifu mwingine.</string>
+  <string name="add_profile_activity_name_empty_error_text" fuzzy="true">Tafadhali weka jina la wasifu huu.</string>
+  <string name="add_profile_activity_name_only_letters_error_text" fuzzy="true">Majina yanaweza kuwa na herufi pekee. Jaribu jina lingine?</string>
+  <string name="add_profile_activity_pin_length_error_text">Nambari yako ya Siri inapaswa kuwa na urefu wa tarakimu 3.</string>
+  <string name="add_profile_activity_wrong_confirm_pin_error_text">Tafadhali hakikisha kwamba Nambari za Siri zote mbili zinalingana.</string>
+  <string name="add_profile_activity_info_image_content_description">Maelezo zaidi kuhusu Nambari za Siri zenye tarakimu 3.</string>
+  <string name="add_profile_activity_edit_image_content_description">Picha ya sasa ya wasifu</string>
+  <string name="add_profile_activity_edit_user_image_content_description">Hariri picha ya wasifu</string>
+  <string name="onboarding_activity_slide_0_title">Karibu kwa %s!</string>
+  <string name="onboarding_activity_slide_0_description">Jifunze chochote unachotaka kwa njia bora na ya kufurahisha.</string>
+  <string name="onboarding_activity_slide_1_title">Ongeza watumiaji kwenye akaunti yako.</string>
+  <string name="onboarding_activity_slide_1_description">Elezea uzoefu na uunde hadi wasifu 10.</string>
+  <string name="onboarding_activity_slide_2_title">Pakua ya nje ya mtandao.</string>
+  <string name="onboarding_activity_slide_2_description">Endelea kujifunza masomo yako bila muunganisho wa mtandao.</string>
+  <string name="onboarding_activity_slide_3_title">Furahia!</string>
+  <string name="onboarding_activity_slide_3_description">Furahia matukio yako ya kujifunza kwa masomo yetu ya bure na ya ufanisi.</string>
+  <string name="onboarding_activity_skip_text">Ruka</string>
+  <string name="onboarding_activity_next_arrow_text">Inayofuata</string>
+  <string name="onboarding_activity_get_started_text">Anza</string>
+  <string name="onboarding_activity_slide_dots_content_description">Slaidi %s ya %s</string>
+  <string name="pin_password_activity_hello_text">Habari, %s!</string>
+  <string name="pin_password_activity_enter_text">Tafadhali weka Nambari yako ya Siri ya Msimamizi.</string>
+  <string name="pin_password_activity_user_enter_text">Tafadhali weka Nambari yako ya Siri.</string>
+  <string name="pin_password_activity_admin_input_pin_text">Nambari ya Siri ya Tarakimu 5 ya Msimamizi.</string>
+  <string name="pin_password_activity_user_input_pin_text">Nambari ya Siri ya Tarakimu 3 ya Mtumiaji.</string>
+  <string name="pin_password_activity_forgot_pin_text" fuzzy="true">Nilisahau nambari yangu.</string>
+  <string name="pin_password_activity_incorrect_pin_error">Nambari ya Siri si sahihi.</string>
+  <string name="pin_password_activity_show_pin_text">Onyesha</string>
+  <string name="pin_password_activity_hide_pin_text">ficha</string>
+  <string name="pin_password_activity_close_text">Funga</string>
+  <string name="pin_password_activity_success_text">Mabadiliko ya Nambari ya Siri yamefaulu</string>
+  <string name="pin_password_activity_dialog_forgot_title">Je, umesahau Nambari ya Siri?</string>
+  <string name="pin_password_activity_dialog_forgot_message" fuzzy="true">Ili kuweka upya Nambari yako ya Siri, tafadhali ondoa %s kisha uisakinishe upya.\n\nKumbuka kwamba ikiwa kifaa hakijakuwa mtandaoni, unaweza kupoteza maendeleo ya mtumiaji kwenye akaunti nyingi.</string>
+  <string name="pin_password_activity_shown_icon_content_description">Ishara ya nenosiri iliyoonyeshwa</string>
+  <string name="pin_password_activity_hidden_icon_content_description">Ishara ya nenosiri iliyofichwa</string>
+  <string name="pin_password_activity_toolbar_title">Weka Nambari ya Siri</string>
+  <string name="admin_settings_dialog_input_pin_hint">Nambari ya Siri ya Msimamizi</string>
+  <string name="admin_settings_dialog_heading">Ufikiaji wa mipangilio ya msimamizi</string>
+  <string name="admin_settings_dialog_message_text">Nambari ya Siri ya Msimamizi inahitajika ili kubadilisha Nambari ya Siri ya mtumiaji</string>
+  <string name="admin_settings_dialog_cancel_button_text">Ghairi</string>
+  <string name="admin_settings_dialog_submit_button_text">Wasilisha</string>
+  <string name="admin_settings_dialog_incorrect_pin_error_text">Nambari ya Siri ya msimamizi si Sahihi. Tafadhali jaribu tena.</string>
+  <string name="admin_settings_dialog_new_pin_text">Nambari ya Siri mpya ya %1$s.</string>
+  <string name="pin_password_activity_reset_pin_dialog_title">Weka Nambari mpya ya Siri</string>
   <string name="my_downloads_activity_title">Vipakuliwa Vyangu</string>
-  <string name="tab_downloads">Vipakuliwa</string>
-  <string name="tab_updates">Sasisho (2)</string>
+  <string name="my_downloads_fragment_tab_download_text">Vipakuliwa</string>
+  <string name="my_downloads_fragment_tab_updates_text">Sasisho (2)</string>
   <string name="home_activity_back_dialog_message">Je, ungependa kuondoka kwenye wasifu wako?</string>
-  <string name="home_activity_back_dialog_cancel">Ghairi</string>
-  <string name="home_activity_back_dialog_exit">Toka</string>
+  <string name="home_activity_back_dialog_cancel_button">Ghairi</string>
+  <string name="home_activity_back_dialog_exit_button">Toka</string>
   <string name="home_activity_title">Mwanzo</string>
   <string name="profile_list_activity_title">Wasifu</string>
-  <string name="profile_edit_created">Ilitengenezwa kwa %s</string>
-  <string name="profile_last_used">Mara ya mwisho kutumika</string>
-  <string name="profile_edit_rename">Badilisha jina</string>
-  <string name="profile_edit_reset">Weka upya Nambari ya Siri</string>
-  <string name="profile_edit_delete">Ufutaji wa Wasifu</string>
-  <string name="profile_edit_delete_dialog_title">Je, ungependa kufuta wasifu huu kabisa?</string>
-  <string name="profile_edit_delete_dialog_message">Maendeleo yote yatafutwa na hayawezi kurejeshwa.</string>
-  <string name="profile_edit_delete_dialog_positive">Futa</string>
-  <string name="profile_edit_delete_dialog_negative">Ghairi</string>
-  <string name="profile_edit_allow_download_heading">Ruhusu Ufikiaji wa Upakuaji</string>
-  <string name="profile_edit_allow_download_sub">Mtumiaji anaweza kupakua na kufuta maudhui bila Nambari ya Siri ya msimamizi.</string>
+  <string name="profile_edit_activity_created_text">Ilitengenezwa kwa %s</string>
+  <string name="profile_edit_activity_last_used_text">Mara ya mwisho kutumika</string>
+  <string name="profile_edit_activity_rename_text">Badilisha jina</string>
+  <string name="profile_edit_activity_reset_text">Weka upya Nambari ya Siri</string>
+  <string name="profile_edit_activity_delete_button_text">Ufutaji wa Wasifu</string>
+  <string name="profile_edit_activity_dialog_title">Je, ungependa kufuta wasifu huu kabisa?</string>
+  <string name="profile_edit_activity_dialog_message">Maendeleo yote yatafutwa na hayawezi kurejeshwa.</string>
+  <string name="profile_edit_activity_dialog_positive_button">Futa</string>
+  <string name="profile_edit_activity_dialog_negative_button">Ghairi</string>
+  <string name="profile_edit_activity_allow_download_heading">Ruhusu Ufikiaji wa Upakuaji</string>
+  <string name="profile_edit_activity_allow_download_sub">Mtumiaji anaweza kupakua na kufuta maudhui bila Nambari ya Siri ya msimamizi.</string>
   <string name="profile_picture_activity_title">Picha ya Wasifu</string>
-  <string name="profile_progress_edit_dialog_title">Picha ya Wasifu</string>
-  <string name="profile_picture_edit_alert_dialog_cancel_button">Ghairi</string>
-  <string name="profile_picture_edit_alert_dialog_view_profile_picture">Tazama Picha ya Wasifu</string>
-  <string name="profile_picture_edit_alert_dialog_choose_from_library">Chagua Kutoka kwa Maktaba</string>
+  <string name="profile_picture_edit_dialog_title">Picha ya Wasifu</string>
+  <string name="profile_picture_edit_dialog_cancel_button_text">Ghairi</string>
+  <string name="profile_picture_edit_dialog_view_picture_text">Tazama Picha ya Wasifu</string>
+  <string name="profile_picture_edit_dialog_change_picture_text">Chagua Kutoka kwa Maktaba</string>
   <string name="profile_rename_activity_title">Badilisha Jina la Wasifu</string>
-  <string name="profile_rename_label">Jina Jipya</string>
-  <string name="profile_rename_save" fuzzy="true">Hifadhi</string>
+  <string name="profile_rename_activity_rename_input_hint">Jina Jipya</string>
+  <string name="profile_rename_activity_rename_save_button" fuzzy="true">Hifadhi</string>
   <string name="profile_reset_pin_activity_title">Weka upya Nambari ya Siri</string>
-  <string name="profile_reset_pin_main">Weka Nambari mpya ya Siri ili mtumiaji aiweke anapofikia wasifu wake.</string>
-  <string name="profile_reset_pin_user_pin_label">Nambari ya Siri ya tarakimu 3*</string>
-  <string name="profile_reset_pin_admin_pin_label">Nambari ya Siri ya tarakimu 5*</string>
-  <string name="profile_reset_pin_user_confirm_label">Thibitisha Nambari ya Siri ya tarakimu 3*</string>
-  <string name="profile_reset_pin_admin_confirm_label">Thibitisha Nambari ya Siri ya tarakimu 5</string>
-  <string name="profile_reset_pin_error_user_pin_length">Nambari yako ya Siri inapaswa kuwa na urefu wa tarakimu 3.</string>
-  <string name="profile_reset_pin_error_admin_pin_length">Nambari yako ya Siri inapaswa kuwa na urefu wa tarakimu 5.</string>
-  <string name="add_profile_create_a_3_digit_pin">Unda Nambari ya Siri ya tarakimu 3</string>
-  <string name="add_profile_required">Inahitajika</string>
-  <string name="back_button">Kitufe cha Nyuma</string>
-  <string name="next">Inayofuata</string>
-  <string name="administrator_controls_general_label">Jumla</string>
-  <string name="administrator_controls_edit_account">Hariri akaunti</string>
-  <string name="administrator_controls_profile_management_label">Usimamizi wa Wasifu</string>
-  <string name="administrator_controls_edit_profiles">Hariri wasifu</string>
-  <string name="administrator_controls_download_permissions_label">Ruhusa ya kupakua</string>
-  <string name="administrator_controls_update_on_wifi_title">Pakua na usasishe kwenye Wi-fi pekee</string>
-  <string name="administrator_controls_update_on_wifi_message">Mada zitapakuliwa na kusasishwa kwenye Wi-fi pekee. Vipakuliwa au masasisho yoyote ya data ya mtandao wa simu yatawekwa kwenye foleni.</string>
-  <string name="administrator_controls_auto_update_title">Sasisha mada moja kwa moja</string>
-  <string name="administrator_controls_auto_update_message">Mada zilizopakuliwa ambazo zina maudhui mapya zinazopatikana zitasasishwa moja kwa moja.</string>
-  <string name="administrator_controls_app_information_label">Maelezo ya programu.</string>
-  <string name="administrator_controls_app_version">Toleo la Programu</string>
-  <string name="administrator_controls_account_actions_label">Vitendo vya akaunti</string>
-  <string name="administrator_controls_log_out">Toka</string>
-  <string name="log_out_dialog_cancel_button">Ghairi</string>
-  <string name="log_out_dialog_okay_button">Sawa</string>
-  <string name="log_out_dialog_message">Je,una uhakika unataka kutoka kwenye wasifu wako?</string>
-  <string name="app_version_name">Toleo la Programu %s</string>
-  <string name="app_last_update_date">Sasisho la mwisho lilisakinishwa kwenye %s. Tumia nambari ya toleo iliyo hapo juu kutuma maoni kuhusu hitilafu.</string>
+  <string name="profile_reset_pin_fragment_reset_pin_main_text">Weka Nambari mpya ya Siri ili mtumiaji aiweke anapofikia wasifu wake.</string>
+  <string name="profile_reset_pin_fragment_user_pin_text">Nambari ya Siri ya tarakimu 3*</string>
+  <string name="profile_reset_pin_fragment_admin_pin_text">Nambari ya Siri ya tarakimu 5*</string>
+  <string name="profile_reset_pin_fragment_user_confirm_text">Thibitisha Nambari ya Siri ya tarakimu 3*</string>
+  <string name="profile_reset_pin_fragment_admin_confirm_text">Thibitisha Nambari ya Siri ya tarakimu 5</string>
+  <string name="profile_reset_pin_fragment_error_user_pin_length">Nambari yako ya Siri inapaswa kuwa na urefu wa tarakimu 3.</string>
+  <string name="profile_reset_pin_fragment_error_admin_pin_length">Nambari yako ya Siri inapaswa kuwa na urefu wa tarakimu 5.</string>
+  <string name="add_profile_activity_pin_check_box_text">Unda Nambari ya Siri ya tarakimu 3</string>
+  <string name="add_profile_activity_user_name_helper_text">Inahitajika</string>
+  <string name="walkthrough_activity_back_button_text">Kitufe cha Nyuma</string>
+  <string name="next_text">Inayofuata</string>
+  <string name="administrator_controls_fragment_general_label">Jumla</string>
+  <string name="administrator_controls_fragment_edit_account_text">Hariri akaunti</string>
+  <string name="administrator_controls_fragment_profile_management_label">Usimamizi wa Wasifu</string>
+  <string name="administrator_controls_fragment_edit_profiles_text">Hariri wasifu</string>
+  <string name="administrator_controls_fragment_download_permissions_label">Ruhusa ya kupakua</string>
+  <string name="administrator_controls_fragment_topic_update_on_wifi_text">Pakua na usasishe kwenye Wi-fi pekee</string>
+  <string name="administrator_controls_fragment_topic_update_on_wifi_description">Mada zitapakuliwa na kusasishwa kwenye Wi-fi pekee. Vipakuliwa au masasisho yoyote ya data ya mtandao wa simu yatawekwa kwenye foleni.</string>
+  <string name="administrator_controls_fragment_auto_update_topic_text">Sasisha mada moja kwa moja</string>
+  <string name="administrator_controls_fragment_auto_update_topic_description">Mada zilizopakuliwa ambazo zina maudhui mapya zinazopatikana zitasasishwa moja kwa moja.</string>
+  <string name="administrator_controls_fragment_app_information_text">Maelezo ya programu.</string>
+  <string name="administrator_controls_fragment_app_version_text">Toleo la Programu</string>
+  <string name="administrator_controls_fragment_account_actions_text">Vitendo vya akaunti</string>
+  <string name="administrator_controls_fragment_log_out_text">Toka</string>
+  <string name="log_out_dialog_cancel_button_text">Ghairi</string>
+  <string name="log_out_dialog_okay_button_text">Sawa</string>
+  <string name="log_out_dialog_message_text">Je,una uhakika unataka kutoka kwenye wasifu wako?</string>
+  <string name="app_version_fragment_version_name_text">Toleo la Programu %s</string>
+  <string name="app_version_fragment_last_update_date_text">Sasisho la mwisho lilisakinishwa kwenye %s. Tumia nambari ya toleo iliyo hapo juu kutuma maoni kuhusu hitilafu.</string>
   <string name="app_version_activity_title">Toleo la Programu</string>
   <string name="app_language_activity_title">Lugha ya Programu</string>
   <string name="audio_language_activity_title" fuzzy="true">Lugha chaguomsingi ya Sauti</string>
   <string name="reading_text_size_activity_title">Ukubwa wa Maandishi ya Kusoma</string>
-  <string name="title_reading_text_size">Ukubwa wa Maandishi ya Kusoma</string>
-  <string name="story_text_will_look_like_this">Nakala ya hadithi itaonekana hivi.</string>
-  <string name="constant_string_for_text_size">A</string>
-  <string name="audio_language" fuzzy="true">Sauti Chaguomsingi</string>
-  <string name="app_language">Lugha ya Programu</string>
-  <string name="reading_text_size">Ukubwa wa Maandishi ya Kusoma</string>
-  <string name="reading_text_size_small">Ndogo</string>
-  <string name="reading_text_size_medium">Kati</string>
-  <string name="reading_text_size_large">Kubwa</string>
-  <string name="reading_text_size_extra_large">Kubwa Zaidi</string>
-  <string name="slide_seekbar_to_control_text_size">Telezesha upau wa utafutaji ili kudhibiti ukubwa wa maandishi.</string>
-  <string name="profile">Wasifu</string>
-  <string name="story_count_text_view">Hadithi 2</string>
-  <string name="topics_in_progress">Mada zinazoendelea</string>
-  <string name="topic_in_progress">Mada zinazoendelea</string>
-  <string name="stories_completed">Hadithi Zimekamilika</string>
-  <string name="story_completed">Hadithi imekamilika</string>
+  <string name="option_activity_audio_language_text" fuzzy="true">Sauti Chaguomsingi</string>
+  <string name="option_activity_app_language_text">Lugha ya Programu</string>
+  <string name="option_activity_reading_text_size">Ukubwa wa Maandishi ya Kusoma</string>
+  <string name="option_activity_reading_text_size_small">Ndogo</string>
+  <string name="option_activity_reading_text_size_medium">Kati</string>
+  <string name="option_activity_reading_text_size_large">Kubwa</string>
+  <string name="option_activity_reading_text_size_extra_large">Kubwa Zaidi</string>
+  <string name="profile_progress_activity_profile_title">Wasifu</string>
+  <string name="profile_progress_activity_topics_in_progress_text">Mada zinazoendelea</string>
+  <string name="profile_progress_activity_topic_in_progress_text">Mada zinazoendelea</string>
+  <string name="profile_progress_activity_stories_completed_text">Hadithi Zimekamilika</string>
+  <string name="profile_progress_activity_story_completed_text">Hadithi imekamilika</string>
   <string name="options_activity_title">Chaguzi</string>
   <string name="completed_story_list_activity_title">Hadithi Zimekamilika</string>
   <string name="walkthrough_activity_title">Mwongozo wa programu</string>
-  <string name="walkthrough_welcome_description">Jifunze ujuzi mpya wa hesabu katika hadithi zinazokuonyesha jinsi ya kuzitumia katika maisha yako ya kila siku</string>
-  <string name="welcome">\"Karibu %s!\"</string>
-  <string name="what_do_you_want_to_learn">Unataka kujifunza nini?</string>
-  <string name="great">Makuu</string>
-  <string name="lets_get_started" fuzzy="true">Hebu tuanze.</string>
-  <string name="yes">Ndiyo</string>
-  <string name="no">Hapana…</string>
-  <string name="pick_a_different_topic">Chagua \nmada tofauti.</string>
-  <string name="are_you_interested">Je, unavutiwa na:\n%s?</string>
-  <string name="new_hint_available">Kidokezo kipya kinapatikana</string>
-  <string name="show_hints_and_solution">Onyesha vidokezo na suluhisho</string>
-  <string name="hints_and_solution_close_icon_description">Funga</string>
-  <string name="hints_toolbar_title">Vidokezo</string>
-  <string name="reveal_solution" fuzzy="true">Fichua Suluhisho</string>
-  <string name="reveal_hint" fuzzy="true">Fichua Kidokezo</string>
-  <string name="this_will_reveal_the_solution" fuzzy="true">Hii itafichua suluhisho. Una uhakika?</string>
-  <string name="reveal" fuzzy="true">Fichua</string>
+  <string name="walkthrough_activity_welcome_description">Jifunze ujuzi mpya wa hesabu katika hadithi zinazokuonyesha jinsi ya kuzitumia katika maisha yako ya kila siku</string>
+  <string name="walkthrough_activity_welcome_text">\"Karibu %s!\"</string>
+  <string name="walkthrough_activity_topic_header_text">Unataka kujifunza nini?</string>
+  <string name="walkthrough_activity_final_title_text">Makuu</string>
+  <string name="walkthrough_activity_get_started_text" fuzzy="true">Hebu tuanze.</string>
+  <string name="walkthrough_activity_yes_text">Ndiyo</string>
+  <string name="walkthrough_activity_no_text">Hapana…</string>
+  <string name="walkthrough_activity_pick_different_topic_text">Chagua \nmada tofauti.</string>
+  <string name="walkthrough_activity_are_you_interested_text">Je, unavutiwa na:\n%s?</string>
+  <string name="question_player_activity_new_hint_available_text">Kidokezo kipya kinapatikana</string>
+  <string name="state_fragment_open_hint_content_description">Onyesha vidokezo na suluhisho</string>
+  <string name="hint_solution_dialog_close_icon_description">Funga</string>
+  <string name="state_fragment_hint_bar_title">Vidokezo</string>
+  <string name="hint_solution_dialog_reveal_solution_text" fuzzy="true">Fichua Suluhisho</string>
+  <string name="hint_solution_dialog_reveal_hint_text" fuzzy="true">Fichua Kidokezo</string>
+  <string name="hint_solution_dialog_reveal_dialog_solution_text" fuzzy="true">Hii itafichua suluhisho. Una uhakika?</string>
+  <string name="hint_solution_dialog_reveal_dialog_button_text" fuzzy="true">Fichua</string>
   <string name="just_now">sasa hivi</string>
   <string name="last_logged_in_recently">hivi karibuni</string>
   <string name="yesterday">jana</string>
-  <string name="return_to_topic">Rudi kwenye mada</string>
-  <string name="explanation">Ufafanuzi:</string>
-  <string name="drag_and_drop_interaction_group_merge_hint">Ikiwa vitu viwili ni sawa, viunganishe.</string>
-  <string name="link_to_item_below">Unganisha na kipengee %s</string>
-  <string name="unlink_items">Tenganisha vipengee katika %s</string>
-  <string name="move_item_down_content_description">Hamisha kipengee chini hadi %s</string>
-  <string name="move_item_up_content_description">Hamisha kipengee juu hadi %s</string>
-  <string name="up_button_disabled">Juu</string>
-  <string name="down_button_disabled">Chini</string>
+  <string name="hint_solution_dialog_explanation_text">Ufafanuzi:</string>
+  <string name="state_fragment_drag_drop_interaction_group_merge_hint">Ikiwa vitu viwili ni sawa, viunganishe.</string>
+  <string name="state_fragment_drag_drop_interaction_link_to_item_below">Unganisha na kipengee %s</string>
+  <string name="state_fragment_drag_drop_interaction_unlink_items">Tenganisha vipengee katika %s</string>
+  <string name="state_fragment_drag_drop_interaction_move_item_down_content_description">Hamisha kipengee chini hadi %s</string>
+  <string name="state_fragment_drag_drop_interaction_move_item_up_content_description">Hamisha kipengee juu hadi %s</string>
+  <string name="state_fragment_drag_drop_interaction_up_button_disabled">Juu</string>
+  <string name="state_fragment_drag_drop_interaction_down_button_disabled">Chini</string>
   <string name="profile_last_visited">%s %s</string>
-  <string name="topic_revision_recyclerview_tag">mada_marudio_mtazamo wa kuchakata tena_tag</string>
-  <string name="ongoing_recycler_view_tag">Inaendelea_kuchakata tena_mtazamo_tag</string>
-  <string name="item_selection_text" fuzzy="true">Tafadhali chagua angalau chaguo moja.</string>
+  <string name="topic_fragment_revision_recyclerview_tag">mada_marudio_mtazamo wa kuchakata tena_tag</string>
+  <string name="ongoing_topic_list_fragment_recycler_view_tag">Inaendelea_kuchakata tena_mtazamo_tag</string>
   <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="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>
-  <string name="largest_text_size_content_description">Maandishi kubwa zaidi</string>
   <string name="coming_soon">Inakuja Hivi Karibuni</string>
   <string name="recommended_stories">Hadithi Zinazopendekezwa</string>
   <string name="stories_for_you">Hadithi Kwa Ajili Yako</string>
   <string name="question_player_activity_title">Hali ya Mazoezi</string>
   <string name="revision_card_activity_title">Ukurasa wa marekebisho ya ujuzi</string>
-  <string name="audio_player_seekbar_content_description">Maendeleo ya sauti</string>
-  <string name="audio_language_icon_content_description">Badilisha lugha</string>
-  <string name="audio_player_on">Sauti, IMEWASHWA</string>
-  <string name="audio_player_off">Sauti, IMEZIMWA</string>
-  <string name="correct_submitted_answer">Jibu sahihi lililowasilishwa</string>
-  <string name="correct_submitted_answer_with_append">Jibu sahihi lililowasilishwa: %s</string>
-  <string name="incorrect_submitted_answer">Jibu lililowasilishwa lisilo sahihi</string>
-  <string name="incorrect_submitted_answer_with_append">Jibu lililowasilishwa lisilo sahihi: %s</string>
+  <string name="audio_fragment_progress_seek_bar_content_description">Maendeleo ya sauti</string>
+  <string name="audio_fragment_language_icon_content_description">Badilisha lugha</string>
+  <string name="exploration_activity_audio_player_on_text">Sauti, IMEWASHWA</string>
+  <string name="exploration_activity_audio_player_off_text">Sauti, IMEZIMWA</string>
+  <string name="state_fragment_correct_submitted_answer">Jibu sahihi lililowasilishwa</string>
+  <string name="state_fragment_correct_submitted_answer_with_append">Jibu sahihi lililowasilishwa: %s</string>
+  <string name="state_fragment_incorrect_submitted_answer">Jibu lililowasilishwa lisilo sahihi</string>
+  <string name="state_fragment_incorrect_submitted_answer_with_append">Jibu lililowasilishwa lisilo sahihi: %s</string>
   <string name="third_party_dependency_list_activity_title">Tegemeo ya mhusika wa tatu</string>
   <string name="third_party_dependency_version_formatter">toleo %s</string>
   <string name="license_list_activity_title">Leseni za Hakimiliki</string>
   <string name="license_text_viewer_activity_title">Mtazamo wa Leseni ya Hakimiliki</string>
   <string name="help_activity_back_arrow_description">Nenda nyuma hadi %s</string>
-  <string name="help_activity_third_party_dependencies_list">orodha ya tegemezi ya mhusika wa tatu</string>
-  <string name="help_activity_copyright_licenses_list">orodha ya leseni za hakimiliki</string>
+  <string name="help_activity_third_party_dependencies_text">orodha ya tegemezi ya mhusika wa tatu</string>
+  <string name="help_activity_copyright_licenses_text">orodha ya leseni za hakimiliki</string>
   <string name="resume_lesson_activity_title">Rejesha Somo</string>
-  <string name="resume_lesson_button">Endelea</string>
-  <string name="start_over_lesson_button">Anza tena</string>
-  <string name="home_screen_good_morning_greeting_fragment">Habari ya asubuhi,</string>
-  <string name="home_screen_good_afternoon_greeting_fragment">Habari ya mchana,</string>
-  <string name="home_screen_good_evening_greeting_fragment">Habari ya jioni,</string>
+  <string name="resume_lessons_fragment_continue_button_text">Endelea</string>
+  <string name="resume_lessons_fragment_start_over_button_text">Anza tena</string>
+  <string name="home_activity_good_morning_greeting_text">Habari ya asubuhi,</string>
+  <string name="home_activity_good_afternoon_greeting_text">Habari ya mchana,</string>
+  <string name="home_activity_good_evening_greeting_text">Habari ya jioni,</string>
   <string name="faq_question_1">Ninawezaje kuunda wasifu mpya?</string>
   <string name="faq_question_2">Ninawezaje kufuta wasifu?</string>
   <string name="faq_question_3">Nitabadilisha aje barua pepe/nambari yangu ya simu?</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9b924f81a97..72c779927d4 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,167 +1,541 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="nav_header_desc">Navigation header</string>
-  <string name="menu_options">Options</string>
-  <string name="menu_my_downloads">My Downloads</string>
-  <string name="menu_help">Help</string>
+  <!-- AdministratorControlActivity -->
+  <string name="administrator_controls_activity_title">Administrator Controls</string>
+  <string name="administrator_controls_activity_learner_analytics_text">Learner Study Analytics</string>
+  <!-- AdministratorControlsFragment -->
+  <string name="administrator_controls_fragment_general_label">General</string>
+  <string name="administrator_controls_fragment_edit_account_text">Edit account</string>
+  <string name="administrator_controls_fragment_profile_management_label">Profile Management</string>
+  <string name="administrator_controls_fragment_edit_profiles_text">Edit profiles</string>
+  <string name="administrator_controls_fragment_download_permissions_label">Download Permissions</string>
+  <string name="administrator_controls_fragment_topic_update_on_wifi_text">Download and update only on Wi-fi</string>
+  <string name="administrator_controls_fragment_topic_update_on_wifi_description">Topics will be downloaded and updated only on Wi-fi. Any downloads or updates of cellular data will be queued.</string>
+  <string name="administrator_controls_fragment_auto_update_topic_text">Automatically update topics</string>
+  <string name="administrator_controls_fragment_auto_update_topic_description">Downloaded topics that have new content available will automatically update.</string>
+  <string name="administrator_controls_fragment_app_information_text">App Information</string>
+  <string name="administrator_controls_fragment_app_version_text">App Version</string>
+  <string name="administrator_controls_fragment_account_actions_text">Account Actions</string>
+  <string name="administrator_controls_fragment_log_out_text">Log Out</string>
+  <!-- AdministratorControlsFragmentTestActivity -->
+  <string name="administrator_controls_fragment_test_activity_title">Administrator Controls Fragment Test Activity</string>
+  <!-- AdminAuthActivity -->
+  <string name="admin_auth_activity_title">Administrator Controls</string>
+  <string name="admin_auth_activity_add_profiles_title">Authorise to add profiles</string>
+  <string name="admin_auth_activity_access_controls_title">Authorise to access Administrator Controls</string>
+  <string name="admin_auth_activity_heading_text">Administrator Authorization Required</string>
+  <string name="admin_auth_activity_subheading_text">Enter the Administrator PIN in order to create a new account.</string>
+  <string name="admin_auth_activity_controls_subheading_text">Enter the Administrator PIN in order to access Administrator Controls.</string>
+  <string name="admin_auth_activity_input_pin_hint_text">Administrator\'s PIN</string>
+  <string name="admin_auth_activity_incorrect_pin_label">Incorrect Administrator PIN. Please try again.</string>
+  <string name="admin_auth_activity_null_pin_input_label">Please enter Administrator PIN.</string>
+  <string name="admin_auth_activity_submit_button_text">Submit</string>
+  <string name="admin_auth_activity_tool_bar_content_desc">Close</string>
+  <!-- AdminPinActivity -->
+  <string name="admin_pin_activity_title">Authorise to add profiles</string>
+  <string name="admin_pin_activity_requirement_description_text">Before we add profiles, we need to protect your account by creating a PIN. This gives you the ability to authorize manage profiles on the device.</string>
+  <string name="admin_pin_activity_warning_text">Do <b>not</b> use a PIN you have set for personal accounts like banking or social security.</string>
+  <string name="admin_pin_activity_input_new_pin_hint">New 5-Digit PIN</string>
+  <string name="admin_pin_activity_input_confirm_pin_hint">Confirm 5-Digit PIN</string>
+  <string name="admin_pin_activity_pin_length_error">Your PIN should be 5 digits long.</string>
+  <string name="admin_pin_activity_wrong_pin_text">Please make sure that both PINs match.</string>
+  <string name="admin_pin_activity_submit_button_text">Save</string>
+  <!-- AddProfileActivity -->
+  <string name="add_profile_activity_title">Add Profile</string>
+  <string name="add_profile_activity_input_name_hint">Name</string>
+  <string name="add_profile_activity_input_pin_hint">3-Digit PIN</string>
+  <string name="add_profile_activity_input_confirm_pin_hint">Confirm 3-Digit PIN</string>
+  <string name="add_profile_activity_allow_download_text">Allow Download Access</string>
+  <string name="add_profile_activity_allow_download_sub_text">User is able to download and delete content without Administrator PIN.</string>
+  <string name="add_profile_activity_create_button_text">Create</string>
+  <string name="add_profile_activity_close_dialog_text">Close</string>
+  <string name="add_profile_activity_pin_info_dialog_text">With a PIN, nobody else can access a profile besides this assigned user.</string>
+  <string name="add_profile_activity_name_not_unique_error_text">This name is already in use by another profile.</string>
+  <string name="add_profile_activity_name_empty_error_text">Please enter a valid name for this profile.</string>
+  <string name="add_profile_activity_name_only_letters_error_text">Please choose a profile name that doesn\'t include numbers or symbols.</string>
+  <string name="add_profile_activity_pin_length_error_text">Your PIN should be 3 digits long.</string>
+  <string name="add_profile_activity_wrong_confirm_pin_error_text">Please make sure that both PINs match.</string>
+  <string name="add_profile_activity_info_image_content_description">More information on 3-digit PINs.</string>
+  <string name="add_profile_activity_edit_image_content_description">Current profile picture</string>
+  <string name="add_profile_activity_edit_user_image_content_description">Edit profile picture</string>
+  <string name="add_profile_activity_pin_check_box_text">Create a 3-Digit PIN</string>
+  <string name="add_profile_activity_user_name_helper_text">Required</string>
+  <!-- AdminSettingsDialogFragment -->
+  <string name="admin_settings_dialog_input_pin_hint">Administrator\'s PIN</string>
+  <string name="admin_settings_dialog_heading">Access to Administrator Settings</string>
+  <string name="admin_settings_dialog_message_text">Administrator\'s PIN required to change user\'s PIN</string>
+  <string name="admin_settings_dialog_cancel_button_text">Cancel</string>
+  <string name="admin_settings_dialog_submit_button_text">Submit</string>
+  <string name="admin_settings_dialog_incorrect_pin_error_text">Incorrect Administrator PIN. Please try again.</string>
+  <string name="admin_settings_dialog_new_pin_text">%1$s\'s New PIN.</string>
+  <!-- AppVersionActivity -->
+  <string name="app_version_activity_title">App Version</string>
+  <string name="app_version_fragment_app_info_icon_description">App Info</string>
+  <string name="app_version_fragment_version_name_text">App Version %s</string>
+  <string name="app_version_fragment_last_update_date_text">The last update was installed on %s. Use the above version number to send feedback about bugs.</string>
+  <!-- AudioFragment -->
+  <string name="audio_fragment_play_description">Play audio</string>
+  <string name="audio_fragment_pause_description">Pause audio</string>
+  <string name="audio_fragment_audio_unavailable_text">%s audio is unavailable.</string>
+  <string name="audio_fragment_offline_dialog_title">Currently Offline</string>
+  <string name="audio_fragment_offline_dialog_message">Make sure Wi-Fi or cellular data is turned on, then try again.</string>
+  <string name="audio_fragment_offline_dialog_positive_button_text">Ok</string>
+  <string name="audio_fragment_progress_seek_bar_content_description">Audio progress</string>
+  <string name="audio_fragment_language_icon_content_description">Change language</string>
+  <string name="audio_fragment_voiceover_language_icon_spotlight_hint">Tap to change the voiceover language.</string>
+  <!-- AudioLanguageDialogFragment -->
+  <string name="audio_language_dialog_okay_button_text">Ok</string>
+  <string name="audio_language_dialog_cancel_button_text">Cancel</string>
+  <string name="audio_language_dialog_title">Audio Language</string>
+  <!-- BetaNoticeDialogFragment -->
+  <string name="beta_notice_dialog_title">Beta Notice</string>
+  <string name="beta_notice_dialog_message_text">Hello! Your app is now being updated to the Beta version. If you experience problems while using the app, or have questions, please contact us at android-feedback@oppia.org.</string>
+  <string name="beta_notice_dialog_preference_checkbox_text">Don\'t show this message again</string>
+  <string name="beta_notice_dialog_close_button_text">OK</string>
+  <!-- CellularAudioDialogFragment -->
+  <string name="cellular_audio_dialog_okay_button_text">Ok</string>
+  <string name="cellular_audio_dialog_cancel_button_text">Cancel</string>
+  <string name="cellular_audio_dialog_title">Currently on Cellular Data</string>
+  <string name="cellular_audio_dialog_description">Streaming audio may use a lot of cellular data.</string>
+  <string name="cellular_audio_dialog_checkboxes_text">Don\'t show this message again</string>
+  <!-- ConceptCardFragment -->
+  <string name="concept_card_fragment_title">Concept Card</string>
+  <string name="concept_card_test_activity_button_one_text">Concept Card 1</string>
+  <string name="concept_card_test_activity_button_two_text">Concept Card 2</string>
+  <!-- CompletedStoryListActivity -->
+  <string name="completed_story_list_activity_title">Stories Completed</string>
+  <string name="completed_story_list_fragment_recyclerview_tag">completed_story_list_recyclerview_tag</string>
+  <!-- ExplorationActivity -->
   <string name="exploration_activity_title">Exploration Player</string>
-  <string name="play_exploration_button_text">Play exploration</string>
+  <string name="exploration_activity_audio_player_on_text">Audio, ON</string>
+  <string name="exploration_activity_audio_player_off_text">Audio, OFF</string>
+  <string name="exploration_activity_play_button_text">Play exploration</string>
+  <string name="exploration_activity_options_menu_close_text">Close</string>
+  <string name="exploration_activity_exit_button_spotlight_hint">Exit anytime using this button. We will save your progress.</string>
+  <string name="exploration_activity_voiceover_icon_spotlight_hint">Would you like %s to read for you? Tap on this button to try it!</string>
+  <string name="exploration_activity_question_player_title">Practice Mode</string>
+  <!-- FAQListActivity -->
+  <string name="faq_list_activity_item_header_text">Featured Questions</string>
+  <string name="faq_list_activity_title">FAQs</string>
+  <string name="faq_activity_title">FAQs (Frequently Asked Questions)</string>
+  <!-- ForcedAppDeprecationNoticeDialogFragment -->
+  <string name="forced_app_update_dialog_title" description="The title of the dialog shown when a user's pre-release app has expired.">App update required</string>
+  <string name="forced_app_update_dialog_message" description="The main message of the dialog shown when a user's app has expired.">A new version of %s is now available. The new version is more secure, and improves your learning experience.\n\nThis version is no longer supported. To continue using the app, please update to the latest version.</string>
+  <string name="forced_app_update_dialog_update_button_text" description="The update button text of the dialog shown when a user's pre-release app has expired.">Update</string>
+  <string name="forced_app_update_dialog_close_button_text" description="The close button text of the dialog shown when a user's pre-release app has expired.">Close app</string>
+  <!-- Frequently asked questions & generic app help. -->
+  <string name="faq_question_1">How can I create a new profile?</string>
+  <string name="faq_question_2">How can I delete a profile?</string>
+  <string name="faq_question_3">How can I change my email/phone number?</string>
+  <string name="faq_question_4">What is %s?</string>
+  <string name="faq_question_5">Who is an Administrator?</string>
+  <string name="faq_question_6">Why is the Exploration player not loading?</string>
+  <string name="faq_question_7">Why is my audio not playing?</string>
+  <string name="faq_question_9">I can\'t find my question here. What now?</string>
+  <string name="faq_answer_1"><![CDATA[<p>If it is your first time creating a profile and not have a PIN:<ol><li>From the Profile Chooser, tap on <strong>Set up Multiple Profiles</strong>.</li><li>Create a PIN and <strong>Save</strong>.</li><li>Fill in all fields for the profile.<ol><li>(Optional) Upload a photo.</li><li>Enter a name.</li><li>(Optional) Assign a 3-digit PIN.</li></ol></li><li>Tap <strong>Create</strong>. This profile is added to your Profile Chooser!</li></ol></p><p> If you have created a profile before and have a PIN:<ol><li>From the Profile Chooser, tap on <strong>Add Profile</strong>. </li><li>Enter your PIN and tap <strong>Submit</strong>. </li><li>Fill in all fields for the profile.<ol><li> (Optional) Upload a photo. </li><li> Enter a name. </li><li> (Optional) Assign a 3-digit PIN. </li></ol></li><li>Tap <strong>Create</strong>. This profile is added to your Profile Chooser!</li></ol></p><br><p>Note: Only the <u>Administrator</u> is able to manage profiles.</p>]]></string>
+  <string name="faq_answer_2"><![CDATA[<p>Once a profile is deleted:</p><ol><li>The profile cannot be recovered. </li><li> Profile information such as name, photos, and progress will be permanently deleted. </li></ol><p>To delete a profile (excluding the <u>Administrator\'s</u>):</p><ol><li> From the Administrator\'s Home Page, tap on the menu button on the top left. </li><li>Tap on <strong>Administrator Controls</strong>. </li><li>Tap on <strong>Edit Profiles</strong>. </li><li>Tap on the Profile you would like to delete. </li><li>At the bottom of the screen, tap <strong>Profile Deletion</strong>. </li><li>Tap <strong>Delete</strong> to confirm deletion. </li></ol><p><br></p><p>Note: Only the <u>Administrator</u> is able to manage profiles.</p>]]></string>
+  <string name="faq_answer_3"><![CDATA[<p>To change your email/phone number:</p><ol><li>From the Administrator\'s Home Page, tap on the menu button on the top left.</li><li>Tap on <strong>Administrator Controls</strong>.</li><li>Tap on <strong>Edit Account</strong>.</li></ol><p><br></p> <p>If you want to change your email:</p><ol><li>Enter your new email and tap <strong>Save</strong>.</li><li>A confirmation link is sent to confirm your new email. The link will expire after 24 hours and must be clicked on to be associated with your account.</li></ol><p><br></p> <p>If changing your phone number:</p><ol><li> Enter your new phone number and tap <strong>Verify</strong>.</li><li> A code is sent to confirm your new number. The code will expire after 5 minutes and must be entered in the new screen to be associated with your account.</li></ol>]]></string>
+  <string name="faq_answer_4"><![CDATA[<p>%1$s <i>"O-pee-yah"</i> (Finnish) - "to learn"</p><p><br></p><p>%1$s\'s mission is to help anyone learn anything they want in an effective and enjoyable way.</p><p><br></p><p>By creating a set of free, high-quality, demonstrably effective lessons with the help of educators from around the world, %1$s aims to provide students with quality education — regardless of where they are or what traditional resources they have access to.</p><p><br></p><p>As a student, you can begin your learning adventure by browsing the topics listed on the Home Page!</p>]]></string>
+  <string name="faq_answer_5"><![CDATA[<p>An Administrator is the main user that manages profiles and settings for every profile on their account. They are most likely your parent, teacher, or guardian that created this profile for you. </p><p><br></p><p>Administrators have the ability to manage profiles, assign PINs, and change other settings under their account. Depending on your profile, Administrator permissions may be required for certain features such as changing your PIN, and more. </p><p><br></p><p>To see who your Administrator is, go to the Profile Chooser. The first profile listed and has "Administrator" written under their name is the Administrator. </p>]]></string>
+  <string name="faq_answer_6"><![CDATA[<p>If the Exploration Player is not loading</p><p><br></p><p>Check to see if the app is up to date:</p><p><ul><li> Go to the Play Store and make sure the app is updated to its latest version </li></ul><p><br></p><p>Check your internet connection:</p><ul><li> If your internet connection is slow, try re-connecting to your Wi-Fi network or connecting to a different network. </li></ul><p>Ask the Administrator to check their device and internet connection:</p><ul><li> Get the Administrator to troubleshoot using the steps above </li></ul><p>Let us know if you still have issues with loading:</p><ul><li> Report a problem by contacting us at admin@oppia.org. </li></ul>]]></string>
+  <string name="faq_answer_7"><![CDATA[<p>If your audio is not playing</p><p><br></p><p>Check to see if the app is up to date:</p><ul><li> Go to the Play Store and make sure the app is updated to its latest version </li></ul><p><br></p><p>Check your internet connection:</p><ul><li> If your internet connection is slow, try re-connecting to your Wi-Fi network or connecting to a different network. Slow internet may cause the audio to load irregularly, making it difficult to play. </li></ul><p><br></p><p>Ask the Administrator to check their device and internet connection:</p><ul><li> Get the Administrator to troubleshoot using the steps above</li></ul><p><br></p><p>Let us know if you still have issues with loading:</p><ul><li> Report a problem by contacting us at admin@oppia.org. </li></ul>]]></string>
+  <string name="faq_answer_9"><![CDATA[<p>If you cannot find your question or would like to report a bug, contact us at admin@oppia.org.</p>]]></string>
+  <!-- GeneralAvailabilityUpgradeNoticeDialogFragment -->
+  <string name="general_availability_notice_dialog_title">General Availability Notice</string>
+  <string name="general_availability_notice_dialog_message">Hello! Your app is now being updated to the General Availability version. If you experience problems while using the app, or have questions, please contact us at android-feedback@oppia.org.</string>
+  <string name="general_availability_notice_dialog_do_not_show_again_text">Don\'t show this message again</string>
+  <string name="general_availability_notice_dialog_close_button_text">OK</string>
+  <!-- HelpActivity -->
   <string name="help_activity_title">Help</string>
-  <string name="bottom_sheet_options_menu_close">Close</string>
-  <string name="menu_switch_profile">Switch Profile</string>
-  <string name="developer_options">Developer Options</string>
-  <string name="administrator_controls">Administrator Controls</string>
-  <string name="drawer_open_content_description">Navigation Menu Open</string>
-  <string name="drawer_close_content_description">Navigation Menu Close</string>
-  <string name="audio_play_description">Play audio</string>
-  <string name="audio_pause_description">Pause audio</string>
-  <string name="audio_unavailable_in_selected_language">%s audio is unavailable.</string>
-  <string name="audio_language_select_dialog_okay_button">Ok</string>
-  <string name="audio_language_select_dialog_cancel_button">Cancel</string>
-  <string name="audio_language_select_dialog_title">Audio Language</string>
-  <string name="audio_dialog_offline_title">Currently Offline</string>
-  <string name="audio_dialog_offline_message">Make sure Wi-Fi or cellular data is turned on, then try again.</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">Cancel</string>
-  <string name="cellular_data_alert_dialog_title">Currently on Cellular Data</string>
-  <string name="cellular_data_alert_dialog_description">Streaming audio may use a lot of cellular data.</string>
-  <string name="cellular_data_alert_dialog_checkbox">Don\'t show this message again</string>
-  <string name="concept_card_toolbar_title">Concept Card</string>
-  <string name="concept_card_one_button_text">Concept Card 1</string>
-  <string name="concept_card_two_button_text">Concept Card 2</string>
-  <string name="revision_card_toolbar_title">Revision Card</string>
-  <string name="unsaved_exploration_dialog_title">Leave to Topic Page?</string>
-  <string name="unsaved_exploration_dialog_description">Your progress will not be saved.</string>
-  <string name="unsaved_exploration_dialog_leave_button">Leave</string>
-  <string name="unsaved_exploration_dialog_cancel_button">Cancel</string>
+  <string name="help_activity_faq_text">Frequently Asked Questions (FAQs)</string>
+  <string name="help_activity_back_arrow_description">Navigate back to %s</string>
+  <string name="help_activity_third_party_dependencies_text">third-party dependencies list</string>
+  <string name="help_activity_copyright_licenses_text">copyright licenses list</string>
+  <!-- HintsAndSolutionDialogFragment -->
+  <string name="hint_solution_dialog_hint_list_item_number">Hint %s</string>
+  <string name="hint_solution_dialog_close_icon_description">Close</string>
+  <string name="hint_solution_dialog_show_solution_text">Show solution</string>
+  <string name="hint_solution_dialog_reveal_solution_text">Show Solution</string>
+  <string name="hint_solution_dialog_solution_text">Solution</string>
+  <string name="hint_solution_dialog_reveal_hint_text">Show Hint</string>
+  <string name="hint_solution_dialog_hide_hint_description">Hide Hint</string>
+  <string name="hint_solution_dialog_hide_solution_description">Hide solution</string>
+  <string name="hint_solution_dialog_exclusive_solution_text">The only solution is: %s</string>
+  <string name="hint_solution_dialog_possible_solution_text">One solution is: %s</string>
+  <string name="hint_solution_dialog_reveal_dialog_solution_text">This will show the solution. Are you sure?</string>
+  <string name="hint_solution_dialog_reveal_dialog_button_text">Show</string>
+  <string name="hint_solution_dialog_explanation_text">Explanation:</string>
+  <string name="hint_solution_dialog_return_to_lesson_button">Return to lesson</string>
+  <!-- HomeActivity -->
+  <string name="home_activity_title">Home</string>
+  <string name="home_story_promoted_story_spotlight_hint">From now, you can see lessons recommended for you here.</string>
+  <string name="home_activity_all_topics_text">Select a Topic to Start</string>
+  <string name="home_activity_good_morning_greeting_text">Good morning,</string>
+  <string name="home_activity_good_afternoon_greeting_text">Good afternoon,</string>
+  <string name="home_activity_good_evening_greeting_text">Good evening,</string>
+  <string name="home_activity_recently_played_stories">Recently-Played Stories</string>
+  <string name="home_activity_last_played_stories">Last-Played Stories</string>
+  <string name="home_activity_view_all_text">View All</string>
+  <string name="home_activity_ongoing_story_last_week">Played within the Last Week</string>
+  <string name="home_activity_ongoing_story_last_month">Played within the Last Month</string>
+  <string name="home_activity_lesson_thumbnail_description">Image for %s</string>
+  <string name="home_activity_topic_play_text">Stories You Can Play</string>
+  <!-- HomeActivityBackDialog -->
+  <string name="home_activity_back_dialog_message">Would you like to exit your profile?</string>
+  <string name="home_activity_back_dialog_cancel_button">Cancel</string>
+  <string name="home_activity_back_dialog_exit_button">Exit</string>
+  <!-- InputInteractionViewTestActivity -->
+  <string name="input_interaction_view_test_activity_submit_button">Submit</string>
+  <string name="input_interaction_view_test_activity_number_input_hint">Write the digit here.</string>
+  <string name="input_interaction_view_test_activity_text_input_hint">Write here.</string>
+  <!-- LicenseListActivity -->
+  <string name="license_list_activity_title">Copyright Licenses</string>
+  <!-- LicenseTextViewerActivity -->
+  <string name="license_text_viewer_activity_title">Copyright License Viewer</string>
+  <!-- LogoutDialog -->
+  <string name="log_out_dialog_cancel_button_text">Cancel</string>
+  <string name="log_out_dialog_okay_button_text">Ok</string>
+  <string name="log_out_dialog_message_text">Are you sure you want to log out of your profile?</string>
+  <!-- MyDownloadsActivity -->
+  <string name="my_downloads_activity_title">My Downloads</string>
+  <string name="my_downloads_fragment_tab_download_text">Downloads</string>
+  <string name="my_downloads_fragment_tab_updates_text">Updates (2)</string>
+  <!-- NavigationDrawerFragment -->
+  <string name="navigation_drawer_fragment_menu_my_downloads_text">My Downloads</string>
+  <string name="navigation_drawer_fragment_open_content_description">Navigation Menu Open</string>
+  <string name="navigation_drawer_fragment_close_content_description">Navigation Menu Close</string>
+  <string name="navigation_drawer_fragment_bar_separator_text">\u0020|\u0020</string>
+  <string name="navigation_drawer_fragment_switch_profile">Switch Profile</string>
+  <string name="navigation_drawer_fragment_developer_options">Developer Options</string>
+  <string name="navigation_drawer_fragment_developer_options_icon_description">Developer Options Icon</string>
+  <string name="navigation_drawer_fragment_administrator_controls_icon_description">Administrator Controls Icon</string>
+  <!-- OngoingListActivity -->
+  <string name="ongoing_topic_list_activity_title">Topics in Progress</string>
+  <string name="ongoing_topic_list_fragment_recycler_view_tag">ongoing_recycler_view_tag</string>
+  <!-- OnboardingActivity -->
+  <string name="onboarding_activity_title">Introduction</string>
+  <string name="onboarding_activity_slide_0_title">Welcome to %s!</string>
+  <string name="onboarding_activity_slide_0_description">Learn anything you want in an effective and enjoyable way.</string>
+  <string name="onboarding_activity_slide_1_title">Add users to your account.</string>
+  <string name="onboarding_activity_slide_1_description">Share the experience and create up to 10 profiles.</string>
+  <string name="onboarding_activity_slide_2_title">Download for offline.</string>
+  <string name="onboarding_activity_slide_2_description">Continue learning your lessons without internet connection.</string>
+  <string name="onboarding_activity_slide_3_title">Have fun!</string>
+  <string name="onboarding_activity_slide_3_description">Enjoy your learning adventures with our free, effective lessons.</string>
+  <string name="onboarding_activity_skip_text">Skip</string>
+  <string name="onboarding_activity_next_arrow_text">Next</string>
+  <string name="onboarding_activity_get_started_text">Get Started</string>
+  <string name="onboarding_activity_slide_dots_content_description">Slide %s of %s</string>
+  <!-- OptionsActivity -->
+  <string name="options_activity_title">Options</string>
+  <string name="app_language_activity_title">App Language</string>
+  <string name="audio_language_activity_title">Preferred Audio Language</string>
+  <string name="reading_text_size_activity_title">Reading Text Size</string>
+  <string name="option_activity_audio_language_text">Preferred Audio Language</string>
+  <string name="option_activity_app_language_text">App Language</string>
+  <string name="option_activity_reading_text_size">Reading Text Size</string>
+  <string name="option_activity_reading_text_size_small">Small</string>
+  <string name="option_activity_reading_text_size_medium">Medium</string>
+  <string name="option_activity_reading_text_size_large">Large</string>
+  <string name="option_activity_reading_text_size_extra_large">Extra Large</string>
+  <!-- OptionalAppDeprecationNoticeDialogFragment -->
+  <string name="optional_app_update_dialog_title" description="The title of the dialog shown when an optional app update is available.">New update available</string>
+  <string name="optional_app_update_dialog_message" description="The main message of the dialog shown when an optional app update is available.">A new version of %s is now available. We recommend that you update the app for bug fixes and a better learning experience.</string>
+  <string name="optional_app_update_dialog_dismiss_button_text" description="The dismiss button text of the dialog shown when an optional app update is available.">Dismiss</string>
+  <string name="optional_app_update_dialog_update_button_text" description="The update button text of the dialog shown when an optional app update is available.">Update</string>
+  <!-- OsDeprecationNoticeDialogFragment -->
+  <string name="os_deprecation_dialog_title" description="The title of the dialog shown when an the OS the user is using is no longer supported.">Update your Android OS</string>
+  <string name="os_deprecation_dialog_message" description="The main message of the dialog shown when an the OS the user is using is no longer supported.">We recommend updating your Android OS to take advantage of %s\'s new features and lessons.\n\nVisit your phone\'s Settings app to update your OS.</string>
+  <string name="os_deprecation_dialog_dismiss_button_text" description="The dismiss button text of the dialog shown when an the OS the user is using is no longer supported.">Dismiss</string>
+  <!-- PolicyActivity -->
+  <string name="policy_activity_title">Policy Page</string>
+  <string name="policy_activity_privacy_policy_title">Privacy Policy</string>
+  <string name="policy_activity_privacy_web_link"><![CDATA[Please visit <a href="https://www.oppia.org/privacy-policy">this page</a> for the latest version of this privacy policy.]]></string>
+  <string name="policy_activity_terms_of_service_title">Terms of Service</string>
+  <string name="policy_activity_agree_to_terms_text"><![CDATA[By using %s, you agree to our <br> <oppia-noninteractive-policy link="tos">Terms of Service</oppia-noninteractive-policy> and <oppia-noninteractive-policy link="privacy">Privacy Policy</oppia-noninteractive-policy>.]]></string>
+  <string name="policy_activity_terms_web_link"><![CDATA[Please visit <a href="https://www.oppia.org/terms">this page</a> for the latest version of these terms.]]></string>
+  <!-- ProfileProgressActivity -->
+  <string name="profile_progress_activity_title">Profile Progress Page</string>
+  <string name="profile_progress_activity_profile_title">Profile</string>
+  <string name="profile_progress_activity_topics_in_progress_text">Topics in Progress</string>
+  <string name="profile_progress_activity_topic_in_progress_text">Topic in Progress</string>
+  <string name="profile_progress_activity_stories_completed_text">Stories Completed</string>
+  <string name="profile_progress_activity_story_completed_text">Story Completed</string>
+  <!-- ProfileChooserFragment -->
+  <string name="profile_chooser_activity_title">Profile selection page</string>
+  <string name="profile_chooser_fragment_admin_text">Administrator</string>
+  <string name="profile_chooser_fragment_select_text">Select your profile</string>
+  <string name="profile_chooser_fragment_add_text">Add Profile</string>
+  <string name="profile_chooser_fragment_set_up_multiple_profiles">Set up Multiple Profiles</string>
+  <string name="profile_chooser_fragment_add_profile_description_text">Add up to 10 users to your account. Perfect for families and classrooms.</string>
+  <string name="profile_chooser_fragment_administrator_controls_text">Administrator Controls</string>
+  <string name="profile_chooser_fragment_language_text">Language</string>
+  <string name="profile_chooser_fragment_language_icon_description">Language Icon</string>
+  <string name="profile_chooser_fragment_setting_icon_description">Setting Icon</string>
+  <!-- ProfileListActivity -->
+  <string name="profile_list_activity_title">Profiles</string>
+  <!-- ProfilePictureActivity -->
+  <string name="profile_picture_activity_title">Profile Picture</string>
+  <string name="profile_picture_activity_profile_picture_description">Profile Picture Image View</string>
+  <!-- ProfileResetPinActivity -->
+  <string name="profile_reset_pin_activity_title">Reset PIN</string>
+  <string name="profile_reset_pin_fragment_reset_pin_main_text">Enter a new PIN for the user to enter when accessing their profile.</string>
+  <string name="profile_reset_pin_fragment_user_pin_text">3-Digit PIN</string>
+  <string name="profile_reset_pin_fragment_admin_pin_text">5-Digit PIN</string>
+  <string name="profile_reset_pin_fragment_user_confirm_text">Confirm 3-Digit PIN</string>
+  <string name="profile_reset_pin_fragment_admin_confirm_text">Confirm 5-Digit PIN</string>
+  <string name="profile_reset_pin_fragment_error_user_pin_length">Your PIN should be 3 digits long.</string>
+  <string name="profile_reset_pin_fragment_error_admin_pin_length">Your PIN should be 5 digits long.</string>
+  <!-- ProfileEditFragmentTestActivity -->
+  <string name="profile_edit_fragment_test_activity_title">Profile Edit Fragment Test Activity</string>
+  <!-- PinPasswordActivity -->
+  <string name="pin_password_activity_title">PIN verification</string>
+  <string name="pin_password_activity_toolbar_title">Enter PIN</string>
+  <string name="pin_password_activity_hello_text">Hi, %s!</string>
+  <string name="pin_password_activity_enter_text">Please enter your Administrator PIN.</string>
+  <string name="pin_password_activity_user_enter_text">Please enter your PIN.</string>
+  <string name="pin_password_activity_admin_input_pin_text">Administrator’s 5-Digit PIN.</string>
+  <string name="pin_password_activity_user_input_pin_text">User’s 3-Digit PIN.</string>
+  <string name="pin_password_activity_forgot_pin_text">Forgot PIN?</string>
+  <string name="pin_password_activity_incorrect_pin_error">Incorrect PIN.</string>
+  <string name="pin_password_activity_show_pin_text">show</string>
+  <string name="pin_password_activity_hide_pin_text">hide</string>
+  <string name="pin_password_activity_close_text">Close</string>
+  <string name="pin_password_activity_success_text">PIN change is successful</string>
+  <string name="pin_password_activity_dialog_forgot_title">Forgot PIN?</string>
+  <string name="pin_password_activity_dialog_forgot_message">To reset your PIN, you\'ll need to clear all saved data for %s.\n\nKeep in mind that this action will cause all profiles and user progress to be deleted, and it cannot be undone. Also, the app will close when this completes and will need to be reopened.</string>
+  <string name="pin_password_activity_reset_app_data_button_text">Reset %s Data</string>
+  <string name="pin_password_activity_reset_dialog_title">Confirm %s Data Reset</string>
+  <string name="pin_password_activity_reset_dialog_message">Are you sure that you want to delete all %s profiles on this device? This operation cannot be undone.</string>
+  <string name="pin_password_activity_reset_dialog_postive_button_text">Yes</string>
+  <string name="pin_password_activity_reset_dialog_negative_button_text">No</string>
+  <string name="pin_password_activity_shown_icon_content_description">Password shown icon</string>
+  <string name="pin_password_activity_hidden_icon_content_description">Password hidden icon</string>
+  <string name="pin_password_activity_reset_pin_dialog_title">Enter a New Pin</string>
+  <string name="pin_password_activity_reset_pin_dialog_message">This PIN will be %s\'s new PIN and will be required when signing in.</string>
+  <!-- ProfilePictureEditDialog -->
+  <string name="profile_picture_edit_dialog_title">Profile Picture</string>
+  <string name="profile_picture_edit_dialog_cancel_button_text">Cancel</string>
+  <string name="profile_picture_edit_dialog_view_picture_text">View Profile Picture</string>
+  <string name="profile_picture_edit_dialog_change_picture_text">Choose From Library</string>
+  <!-- ProfileRenameActivity -->
+  <string name="profile_rename_activity_title">Rename Profile</string>
+  <string name="profile_rename_activity_rename_input_hint">New Name</string>
+  <string name="profile_rename_activity_rename_save_button">Save</string>
+  <!-- ProfileEditActivity -->
+  <string name="profile_edit_activity_title">Edit Profile</string>
+  <string name="profile_edit_activity_created_text">Created on %s</string>
+  <string name="profile_edit_activity_last_used_text">Last used </string>
+  <string name="profile_edit_activity_rename_text">Rename</string>
+  <string name="profile_edit_activity_reset_text">Reset PIN</string>
+  <string name="profile_edit_activity_mark_chapters_for_completion_button_text">Mark Chapters Completed</string>
+  <string name="profile_edit_activity_switching_header_text">Enable Quick Language Switching</string>
+  <string name="profile_edit_activity_switching_label_text">Allow this user to quickly switch between English and Swahili within a lesson.</string>
+  <string name="profile_edit_activity_delete_button_text">Profile Deletion</string>
+  <string name="profile_edit_activity_dialog_title">Permanently delete this profile?</string>
+  <string name="profile_edit_activity_dialog_message">All progress will be deleted and cannot be recovered.</string>
+  <string name="profile_edit_activity_dialog_positive_button">Delete</string>
+  <string name="profile_edit_activity_dialog_negative_button">Cancel</string>
+  <string name="profile_edit_activity_allow_download_heading">Allow Download Access</string>
+  <string name="profile_edit_activity_allow_download_sub">User is able to download and delete content without Administrator password</string>
+  <!-- QuestionPlayerActivity -->
+  <string name="question_player_activity_title">Practice Mode</string>
+  <string name="question_player_activity_new_hint_available_text">New hint available</string>
+  <!-- RecentlyPlayedActivity -->
+  <string name="recently_played_activity_title">Recently-Played Stories</string>
+  <!-- RevisionCardActivity -->
+  <string name="revision_card_activity_title">Skill revision page</string>
+  <string name="revision_card_fragment_continue_studying_text">Continue Studying</string>
+  <!-- ResumeLessonActivity -->
+  <string name="resume_lesson_activity_title">Resume Lesson</string>
+  <string name="resume_lessons_fragment_continue_button_text">Continue</string>
+  <string name="resume_lessons_fragment_start_over_button_text">Start Over</string>
+  <!-- SplashActivity -->
+  <string name="splash_activity_build_developer_label">Developer Build</string>
+  <string name="splash_activity_build_alpha_label">Alpha</string>
+  <string name="splash_activity_build_beta_label">Beta</string>
+  <!-- SpotlightFragment -->
+  <string name="spotlight_fragment_overlay_arrow_content_description">Spotlight Overlay Arrow</string>
+  <string name="spotlight_fragment_close_button_content_description">Close Spotlight Button</string>
+  <!-- SpotlightFragmentTest -->
+  <string name="spotlight_fragment_test_sample_view_text">This is a sample text view</string>
+  <!-- StopExplorationDialogFragment -->
   <string name="stop_exploration_dialog_title">Leave to Topic Page?</string>
   <string name="stop_exploration_dialog_description">Your progress will not be saved.</string>
-  <string name="stop_exploration_dialog_cancel_button">Cancel</string>
-  <string name="stop_exploration_dialog_leave_button">Leave</string>
-  <string name="exploration_exit_button_spotlight_hint">Exit anytime using this button. We will save your progress.</string>
-  <string name="voiceover_icon_spotlight_hint">Would you like %s to read for you? Tap on this button to try it!</string>
-  <string name="voiceover_language_icon_spotlight_hint">Tap to change the voiceover language.</string>
-  <string name="progress_database_full_dialog_title">Maximum storage capacity reached</string>
-  <string name="progress_database_full_dialog_description">Saved progress for the lesson \"%s\" will be deleted.</string>
-  <string name="progress_database_full_dialog_continue_button">Continue</string>
-  <string name="progress_database_full_dialog_leave_without_saving_progress_button">Leave without saving progress</string>
-  <string name="progress_database_full_dialog_back_to_lesson_button">Back to lesson</string>
-  <string name="topic_practice_master_these_skills">Master These Skills</string>
-  <string name="topic_name_text_view">Ratios and Proportional Reasoning</string>
-  <string name="topic_practice_skills_description">Select skills that you would like to practice.</string>
-  <string name="topic_practice_start">Start</string>
-  <string name="info_tab_content_description">Details about the topic.</string>
-  <string name="revision_tab_content_description">Revise concepts learned from completed lessons here.</string>
-  <string name="practice_tab_content_description">Practice the concepts learned from completed lessons.</string>
-  <string name="lessons_tab_content_description">Tap here to start playing a lesson.</string>
-  <string name="topic_lessons_tab_spotlight_hint">Find all your lessons here.</string>
-  <string name="topic_revision_tab_spotlight_hint">Revise concepts learned from completed lessons here.</string>
-  <string name="first_chapter_spotlight_hint">Tap here to start playing a lesson.</string>
-  <string name="state_continue_button">Continue</string>
-  <string name="state_continue_submit">Submit</string>
-  <string name="previous_state_description">Navigate to the previous card</string>
-  <string name="next_state_description">Navigate to the next card</string>
-  <string name="state_submit_button">Submit</string>
-  <string name="submit_button_text">Submit</string>
-  <string name="lesson_replay_button_text">Replay</string>
-  <string name="state_end_exploration_button">Return To Topic</string>
-  <string name="previous_responses_header">Previous Responses (%s)</string>
-  <string name="image_interaction_answer_text">Clicks on %s</string>
-  <string name="state_learn_again_button">Learn Again</string>
-  <string name="topic_download_text">(%s)</string>
-  <string name="see_more">See More</string>
-  <string name="see_less">See Less</string>
-  <string name="sample_text_view_text">This is a sample text view</string>
-  <string name="FAQs">FAQs</string>
-  <string name="featured_questions">Featured Questions</string>
-  <string name="frequently_asked_questions">Frequently Asked Questions</string>
-  <string name="faq_activity_title">FAQs (Frequently Asked Questions)</string>
-  <string name="pin_password_activity_title">PIN verification</string>
-  <string name="onboarding_activity_title">Introduction</string>
-  <string name="frequently_asked_questions_FAQ">Frequently Asked Questions (FAQs)</string>
-  <string name="info">Info</string>
-  <string name="lessons">Lessons</string>
-  <string name="practice">Practice</string>
-  <string name="revision">Revision</string>
-  <string name="administrator_controls_title">Administrator Controls</string>
-  <string name="topic_page">Topic page</string>
-  <string name="topic_name">Topic: %s</string>
-  <string name="topic">Topic</string>
-  <string name="ongoing_topic_list_activity_title">Topics in Progress</string>
-  <string name="topic_story_progress_percentage">%s\%%</string>
-  <string name="topic_play_chapter_index">%s</string>
-  <string name="chapter_name">Chapter %s: %s</string>
-  <string name="chapter_completed">Chapter %s with title %s is completed</string>
-  <string name="chapter_in_progress">Chapter %s with title %s is in progress</string>
-  <string name="chapter_prerequisite_title_label">Complete Chapter %s: %s to unlock this chapter.</string>
-  <string name="chapter_locked_prerequisite_title_label">Chapter %s: %s is currently locked. Please complete chapter %s: %s to unlock this chapter.</string>
-  <string name="chapter_prerequisite_title_label_without_chapter_title">Complete the previous chapter to unlock this chapter.</string>
-  <string name="text_input_default_content_description">Enter text.</string>
-  <string name="fractions_default_hint_text">Enter a fraction in the form x/x, or a mixed number in the form x x/x.</string>
-  <string name="fractions_default_hint_text_no_integer">Enter a fraction in the form x/x.</string>
-  <string name="numeric_input_hint">Enter a number.</string>
-  <string name="number_with_units_input_hint_text">Write numbers with units here.</string>
-  <string name="numeric_expression_default_hint_text">Type an expression here, using only numbers.</string>
-  <string name="algebraic_expression_default_hint_text">Type an expression here.</string>
-  <string name="math_equation_default_hint_text">Type an equation here.</string>
-  <string name="math_expression_error_spaces_in_numerical_input">Please remove the spaces between numbers in your answer.</string>
-  <string name="math_expression_error_unbalanced_parentheses">Please close or remove parentheses.</string>
-  <string name="math_expression_error_single_redundant_parentheses">Please remove the parentheses around the whole answer: \'%s\'.</string>
-  <string name="math_expression_error_multiple_redundant_parentheses">Please remove extra parentheses around the \'(%1$s)\', for example: \'%1$s\'.</string>
-  <string name="math_expression_error_redundant_parentheses_individual_term">Please remove the extra parentheses around \'(%1$s)\', for example: \'%1$s\'.</string>
-  <string name="math_expression_error_unnecessary_symbols">There is an invalid \'%s\' in the answer. Please remove it.</string>
-  <string name="math_expression_error_number_after_var_term">Please rearrange the order of %1$s &amp; %2$s. For example: %2$s%1$s.</string>
-  <string name="math_expression_error_consecutive_binary_operators">%1$s and %2$s should be separated by a number or a variable.</string>
-  <string name="math_expression_error_consecutive_unary_operators">Please remove the extra symbols in your answer.</string>
-  <string name="math_expression_error_missing_lhs_for_addition_operator">Is there a number or a variable missing before or after the addition symbol \'%1$s\'? If not, please remove the extra \'%1$s\'.</string>
-  <string name="math_expression_error_missing_lhs_for_multiplication_operator">Is there a number or a variable missing before or after the multiplication symbol \'%1$s\'? If not, please remove the extra \'%1$s\'.</string>
-  <string name="math_expression_error_missing_lhs_for_division_operator">Is there a number or a variable missing before or after the division symbol \'%1$s\'? If not, please remove the extra \'%1$s\'.</string>
-  <string name="math_expression_error_missing_lhs_for_exponentiation_operator">Is there a number or a variable missing before or after the exponentiation symbol \'%1$s\'? If not, please remove the extra \'%1$s\'.</string>
-  <string name="math_expression_error_missing_rhs_for_addition_operator">There seems to be a number or a variable missing after the addition symbol \'%s\'.</string>
-  <string name="math_expression_error_missing_rhs_for_subtraction_operator">There seems to be a number or a variable missing after the subtraction symbol \'%s\'.</string>
-  <string name="math_expression_error_missing_rhs_for_multiplication_operator">There seems to be a number or a variable missing after the multiplication symbol \'%s\'.</string>
-  <string name="math_expression_error_missing_rhs_for_division_operator">There seems to be a number or a variable missing after the division symbol \'%s\'.</string>
-  <string name="math_expression_error_missing_rhs_for_exponentiation_operator">There seems to be a number or a variable missing after the exponentiation symbol \'%s\'.</string>
-  <string name="math_expression_error_exponent_has_variable">Sorry, variables in exponents are not supported by the app. Please revise your answer.</string>
-  <string name="math_expression_error_exponent_too_large">Sorry, powers higher than 5 are not supported by the app. Please revise your answer.</string>
-  <string name="math_expression_error_nested_exponent">Sorry, repeated powers/exponents are not supported by the app. Please limit your answer to one power.</string>
-  <string name="math_expression_error_hanging_square_root">Missing input for square root.</string>
-  <string name="math_expression_error_term_divided_by_zero">Dividing by zero is invalid. Please revise your answer.</string>
-  <string name="math_expression_error_variable_in_numeric_expression">It looks like you have entered some variables. Please make sure that your answer contains numbers only and remove any variables from your answer.</string>
-  <string name="math_expression_error_invalid_variable">Please use the variables specified in the question and not %s.</string>
-  <string name="math_expression_error_missing_equals">Your equation is missing an \'=\' sign.</string>
-  <string name="math_expression_error_more_than_one_equals">Your equation contains too many \'=\' signs. It should have only one.</string>
-  <string name="math_expression_error_hanging_equals">One of the sides of \'=\' in your equation is empty.</string>
-  <string name="math_expression_error_unsupported_function">Function \'%s\' is not supported. Please revise your answer.</string>
-  <string name="math_expression_error_incomplete_function_name">Did you mean sqrt? If not, please separate the variables with multiplication symbols.</string>
-  <string name="math_expression_error_generic">Sorry, we couldn\'t understand your answer. Please check it to make sure there aren\'t any errors.</string>
-  <string name="enable_audio_playback_content_description">Enable audio voiceover for this lesson.</string>
-  <string name="recently_played_stories">Recently-Played Stories</string>
-  <string name="last_played_stories">Last-Played Stories</string>
-  <string name="view_all">View All</string>
-  <string name="ongoing_story_last_week">Played within the Last Week</string>
-  <string name="ongoing_story_last_month">Played within the Last Month</string>
+  <string name="stop_exploration_dialog_cancel_button_text">Cancel</string>
+  <string name="stop_exploration_dialog_leave_button_text">Leave</string>
+  <!-- StateFragment -->
+  <string name="state_fragment_hint_bulb_content_description">No new hint available</string>
+  <string name="state_fragment_open_hint_content_description">Show hints and solution</string>
+  <string name="state_fragment_hint_bar_title">Hints</string>
+  <string name="state_fragment_text_input_interaction_content_description">Enter text.</string>
+  <string name="state_fragment_fraction_input_interaction_hint">Enter a fraction in the form x/x, or a mixed number in the form x x/x.</string>
+  <string name="state_fragment_fraction_input_interaction_no_integer_hint">Enter a fraction in the form x/x.</string>
+  <string name="state_fragment_numeric_input_interaction_hint">Enter a number.</string>
+  <string name="state_fragment_numeric_input_interaction_default_hint">Type an expression here, using only numbers.</string>
+  <string name="state_fragment_algebraic_input_interaction_default_hint">Type an expression here.</string>
+  <string name="state_fragment_math_equation_default_hint">Type an equation here.</string>
+  <string name="state_fragment_math_expression_space_error">Please remove the spaces between numbers in your answer.</string>
+  <string name="state_fragment_math_expression_unbalanced_parentheses_error">Please close or remove parentheses.</string>
+  <string name="state_fragment_math_expression_single_redundant_parentheses_error">Please remove the parentheses around the whole answer: \'%s\'.</string>
+  <string name="state_fragment_math_expression_multiple_redundant_parentheses_error">Please remove extra parentheses around the \'(%1$s)\', for example: \'%1$s\'.</string>
+  <string name="state_fragment_math_expression_individual_redundant_parentheses_error">Please remove the extra parentheses around \'(%1$s)\', for example: \'%1$s\'.</string>
+  <string name="state_fragment_math_expression_unnecessary_symbols_error">There is an invalid \'%s\' in the answer. Please remove it.</string>
+  <string name="state_fragment_math_expression_number_after_var_error">Please rearrange the order of %1$s &amp; %2$s. For example: %2$s%1$s.</string>
+  <string name="state_fragment_math_expression_consecutive_binary_operators_error">%1$s and %2$s should be separated by a number or a variable.</string>
+  <string name="state_fragment_math_expression_consecutive_unary_operators_error">Please remove the extra symbols in your answer.</string>
+  <string name="state_fragment_math_expression_missing_lhs_for_addition_error">Is there a number or a variable missing before or after the addition symbol \'%1$s\'? If not, please remove the extra \'%1$s\'.</string>
+  <string name="state_fragment_math_expression_missing_lhs_for_multiplication_error">Is there a number or a variable missing before or after the multiplication symbol \'%1$s\'? If not, please remove the extra \'%1$s\'.</string>
+  <string name="state_fragment_math_expression_missing_lhs_for_division_error">Is there a number or a variable missing before or after the division symbol \'%1$s\'? If not, please remove the extra \'%1$s\'.</string>
+  <string name="state_fragment_math_expression_missing_lhs_for_exponentiation_error">Is there a number or a variable missing before or after the exponentiation symbol \'%1$s\'? If not, please remove the extra \'%1$s\'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_addition_error">There seems to be a number or a variable missing after the addition symbol \'%s\'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_subtraction_error">There seems to be a number or a variable missing after the subtraction symbol \'%s\'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_multiplication_error">There seems to be a number or a variable missing after the multiplication symbol \'%s\'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_division_error">There seems to be a number or a variable missing after the division symbol \'%s\'.</string>
+  <string name="state_fragment_math_expression_missing_rhs_for_exponentiation_error">There seems to be a number or a variable missing after the exponentiation symbol \'%s\'.</string>
+  <string name="state_fragment_math_expression_exponent_has_variable_error">Sorry, variables in exponents are not supported by the app. Please revise your answer.</string>
+  <string name="state_fragment_math_expression_exponent_too_large_error">Sorry, powers higher than 5 are not supported by the app. Please revise your answer.</string>
+  <string name="state_fragment_math_expression_nested_exponent_error">Sorry, repeated powers/exponents are not supported by the app. Please limit your answer to one power.</string>
+  <string name="state_fragment_math_expression_hanging_square_root_error">Missing input for square root.</string>
+  <string name="state_fragment_math_expression_divided_by_zero_error">Dividing by zero is invalid. Please revise your answer.</string>
+  <string name="state_fragment_math_expression_variable_in_numeric_error">It looks like you have entered some variables. Please make sure that your answer contains numbers only and remove any variables from your answer.</string>
+  <string name="state_fragment_math_expression_invalid_variable_error">Please use the variables specified in the question and not %s.</string>
+  <string name="state_fragment_math_expression_missing_equals_error">Your equation is missing an \'=\' sign.</string>
+  <string name="state_fragment_math_expression_more_than_one_equals_error">Your equation contains too many \'=\' signs. It should have only one.</string>
+  <string name="state_fragment_math_expression_hanging_equals_error">One of the sides of \'=\' in your equation is empty.</string>
+  <string name="state_fragment_math_expression_unsupported_function_error">Function \'%s\' is not supported. Please revise your answer.</string>
+  <string name="state_fragment_math_expression_incomplete_function_name_error">Did you mean sqrt? If not, please separate the variables with multiplication symbols.</string>
+  <string name="state_fragment_math_expression_generic_error">Sorry, we couldn\'t understand your answer. Please check it to make sure there aren\'t any errors.</string>
+  <string name="state_fragment_continue_button_text">Continue</string>
+  <string name="state_fragment_previous_state_button_description">Navigate to the previous card</string>
+  <string name="state_fragment_next_state_button_description">Navigate to the next card</string>
+  <string name="state_fragment_submit_button_text">Submit</string>
+  <string name="state_fragment_replay_button_text">Replay</string>
+  <string name="state_fragment_return_to_topic_button_text">Return To Topic</string>
+  <string name="state_fragment_previous_responses_header">Previous Responses (%s)</string>
+  <string name="state_fragment_image_interaction_answer_text">Clicks on %s</string>
+  <string name="state_fragment_drag_drop_interaction_group_merge_hint">If two items are equal, merge them.</string>
+  <string name="state_fragment_drag_drop_interaction_link_to_item_below">Link to item %s</string>
+  <string name="state_fragment_drag_drop_interaction_unlink_items">Unlink items at %s</string>
+  <string name="state_fragment_drag_drop_interaction_move_item_down_content_description">Move item down to %s</string>
+  <string name="state_fragment_drag_drop_interaction_move_item_up_content_description">Move item up to %s</string>
+  <string name="state_fragment_drag_drop_interaction_up_button_disabled">Up</string>
+  <string name="state_fragment_drag_drop_interaction_down_button_disabled">Down</string>
+  <string name="state_fragment_text_input_default_hint_text">Tap here to enter text.</string>
+  <string name="state_fragment_correct_submitted_answer">Correct submitted answer</string>
+  <string name="state_fragment_correct_submitted_answer_with_append">Correct submitted answer: %s</string>
+  <string name="state_fragment_incorrect_submitted_answer">Incorrect submitted answer</string>
+  <string name="state_fragment_incorrect_submitted_answer_with_append">Incorrect submitted answer: %s</string>
+  <string name="state_fragment_hint_bar_forced_announcement_text">Go to the bottom of the screen for a hint.</string>
+  <string name="state_fragment_item_selection_no_items_selected_hint_text">Please select all correct choices.</string>
+  <string name="state_fragment_item_selection_some_items_selected_hint_text">You may select more choices.</string>
+  <string name="state_fragment_item_selection_max_items_selected_hint_text">No more than %s choices may be selected.</string>
+  <string name="state_fragment_previous_navigation_button_description">Previous State Navigation Button</string>
+  <string name="state_fragment_previous_button_description">Previous Button</string>
+  <string name="state_fragment_next_button_description">Next Button</string>
+  <!-- StoryActivity -->
   <string name="story_activity_title">Chapter List</string>
-  <string name="lesson_thumbnail_content_description">Image for %s</string>
-  <string name="stories_you_can_play">Stories You Can Play</string>
-  <string name="navigate_up">Navigate up</string>
-  <string name="recently_played_activity">Recently-Played Stories</string>
-  <string name="topic_downloaded">Topic Downloaded</string>
-  <string name="downloaded">Downloaded</string>
-  <string name="question_player_title">Practice Mode</string>
-  <string name="question_training_session_progress">Question %s of %s</string>
-  <string name="question_training_session_progress_finished">Complete</string>
-  <string name="question_training_session_finished_header">Finished</string>
-  <string name="question_training_session_finished_message">You have finished all of the questions! You can choose to play another set of questions, or return to the topic.</string>
-  <string name="status_in_progress">In Progress</string>
-  <string name="status_completed">Completed</string>
-  <string name="show_chapter_list">Show chapter list</string>
-  <string name="hide_chapter_list">Hide chapter list</string>
-  <string name="play_pause_audio">Play/Pause Audio</string>
-  <string name="preferences">Preferences</string>
-  <string name="profile_progress_activity_title">Profile Progress Page</string>
-  <string name="search">Search</string>
+  <string name="story_fragment_lock_icon_content_description">Lock Icon</string>
+  <!-- StopExplorationDialogFragment -->
+  <string name="stop_exploration_dialog_progress_full_title">Maximum storage capacity reached</string>
+  <string name="stop_exploration_dialog_progress_full_description">Saved progress for the lesson \"%s\" will be deleted.</string>
+  <string name="stop_exploration_dialog_progress_full_continue_button">Continue</string>
+  <string name="stop_exploration_dialog_progress_full_without_saving_button">Leave without saving progress</string>
+  <string name="stop_exploration_dialog_progress_full_back_to_lesson_button">Back to lesson</string>
+  <!-- SurveyActivity -->
+  <string name="survey_activity_title">Survey</string>
+  <string name="survey_fragment_previous_button">Previous</string>
+  <string name="survey_fragment_submit_button">Submit</string>
+  <string name="survey_fragment_free_form_text">Leave your feedback here</string>
+  <string name="survey_activity_exit_dialog_continue_button">Continue Survey</string>
+  <string name="survey_activity_exit_dialog_exit_button">Exit</string>
+  <string name="survey_activity_exit_dialog_exit_button_description">Exit Survey</string>
+  <string name="survey_activity_exit_dialog_confirmation_text">Are you sure you want to exit the survey?</string>
+  <string name="survey_activity_exit_dialog_onboarding_text">Your feedback helps us serve learners like you better. Would you like to complete a short survey about your experience?</string>
+  <string name="survey_activity_welcome_dialog_begin_survey_button">Begin Survey</string>
+  <string name="survey_activity_welcome_dialog_maybe_later_button">Maybe Later</string>
+  <string name="survey_activity_outer_dialog_thank_you_message">Thank you for completing the survey. We hope you\'ve enjoyed using %s!</string>
+  <string name="survey_activity_outer_dialog_finish_button">Exit survey</string>
+  <string name="survey_activity_welcome_dialog_onboarding_title_text">We\'d love your feedback!</string>
+  <string name="survey_activity_outer_dialog_onboarding_title_text">Thank you</string>
+  <string name="survey_activity_nps_score_not_likely_text">0 - Not at all likely</string>
+  <string name="survey_activity_nps_score_extremely_likely_text">10 - Extremely likely</string>
+  <string name="survey_fragment_user_type_question">Please select one of the following:</string>
+  <string name="survey_fragment_user_type_answer_learner">I am a learner</string>
+  <string name="survey_fragment_user_type_answer_teacher">I am a teacher</string>
+  <string name="survey_fragment_user_type_answer_parent">I am a parent</string>
+  <string name="survey_fragment_user_type_answer_other">Other</string>
+  <string name="survey_fragment_market_fit_question">How would you feel if you could no longer use %s?</string>
+  <string name="survey_fragment_market_fit_answer_very_disappointed">Very disappointed</string>
+  <string name="survey_fragment_market_fit_answer_somewhat_disappointed">Somewhat disappointed</string>
+  <string name="survey_fragment_market_fit_answer_not_disappointed">Not disappointed</string>
+  <string name="survey_fragment_market_fit_answer_wont_use_oppia">N/A - I don\’t use %s anymore</string>
+  <string name="survey_fragment_nps_promoter_feedback_question">We are glad you have enjoyed your experience with %s. Please share what helped you the most:</string>
+  <string name="survey_fragment_nps_passive_feedback_question">Thanks for responding! How can we provide a better experience?</string>
+  <string name="survey_fragment_nps_detractor_feedback_question">Help us improve your experience! Please share  the primary reason for your score:</string>
+  <string name="survey_fragment_nps_score_question">On a scale from 0–10, how likely are you to recommend %s to a friend or colleague?</string>
+  <!-- ThirdPartyDependencyListActivity -->
+  <string name="third_party_dependency_list_activity_title">Third-party Dependencies</string>
+  <string name="third_party_dependency_version_formatter">version %s</string>
+  <!-- TopicFragment -->
+  <string name="topic_activity_title">Topic page</string>
+  <string name="topic_fragment_lessons_chapter_play_index">%s</string>
+  <string name="topic_fragment_lessons_chapter_play_name_text">Chapter %s: %s</string>
+  <string name="topic_fragment_lessons_chapter_completed_text">Chapter %s with title %s is completed</string>
+  <string name="topic_fragment_lessons_chapter_in_progress_text">Chapter %s with title %s is in progress</string>
+  <string name="topic_fragment_lessons_chapter_prerequisite_label">Complete Chapter %s: %s to unlock this chapter.</string>
+  <string name="topic_fragment_lessons_chapter_locked_prerequisite_label">Chapter %s: %s is currently locked. Please complete chapter %s: %s to unlock this chapter.</string>
+  <string name="topic_fragment_lessons_without_chapter_prerequisite_label">Complete the previous chapter to unlock this chapter.</string>
+  <string name="topic_fragment_practice_master_skills_text">Master These Skills</string>
+  <string name="topic_fragment_practice_skills_description">Select skills that you would like to practice.</string>
+  <string name="topic_fragment_practice_start_button">Start</string>
+  <string name="topic_fragment_info_tab_content_description">Details about the topic.</string>
+  <string name="topic_fragment_revision_tab_content_description">Revise concepts learned from completed lessons here.</string>
+  <string name="topic_fragment_practice_tab_content_description">Practice the concepts learned from completed lessons.</string>
+  <string name="topic_fragment_lessons_tab_content_description">Tap here to start playing a lesson.</string>
+  <string name="topic_fragment_lessons_tab_spotlight_hint">Find all your lessons here.</string>
+  <string name="topic_fragment_revision_tab_spotlight_hint">Revise concepts learned from completed lessons here.</string>
+  <string name="topic_fragment_first_chapter_spotlight_hint">Tap here to start playing a lesson.</string>
+  <string name="topic_fragment_download_text">(%s)</string>
+  <string name="topic_fragment_info_see_more_text">See More</string>
+  <string name="topic_fragment_info_see_less_text">See Less</string>
+  <string name="topic_fragment_info">Info</string>
+  <string name="topic_fragment_lessons">Lessons</string>
+  <string name="topic_fragment_practice">Practice</string>
+  <string name="topic_fragment_revision">Revision</string>
+  <string name="topic_fragment_name_text">Topic: %s</string>
+  <string name="topic_fragment_lessons_story_progress_percentage">%s\%%</string>
+  <string name="topic_fragment_info_topic_downloaded">Topic Downloaded</string>
+  <string name="topic_fragment_question_training_session_progress">Question %s of %s</string>
+  <string name="topic_fragment_question_training_session_progress_finished">Complete</string>
+  <string name="topic_fragment_question_end_session_header_text">Finished</string>
+  <string name="topic_fragment_question_end_session_body_text">You have finished all of the questions! You can choose to play another set of questions, or return to the topic.</string>
+  <string name="topic_fragment_lessons_story_status_in_progress">In Progress</string>
+  <string name="topic_fragment_lessons_story_status_completed">Completed</string>
+  <string name="topic_fragment_lessons_show_chapter_list">Show chapter list</string>
+  <string name="topic_fragment_lessons_hide_chapter_list">Hide chapter list</string>
+  <string name="topic_fragment_revision_recyclerview_tag">topic_revision_recyclerview_tag</string>
+  <string name="topic_fragment_revision_previous_subtopic_talkback_text">The previous subtopic is %s</string>
+  <string name="topic_fragment_revision_next_subtopic_talkback_text">The next subtopic is %s</string>
+  <string name="topic_fragment_info_download_status_image_description">Download Status</string>
+  <!-- UnsavedExplorationDialogFragment -->
+  <string name="unsaved_exploration_dialog_title">Leave to Topic Page?</string>
+  <string name="unsaved_exploration_dialog_description">Your progress will not be saved.</string>
+  <string name="unsaved_exploration_dialog_leave_button_text">Leave</string>
+  <string name="unsaved_exploration_dialog_cancel_button_text">Cancel</string>
+  <!-- WalkthroughActivity -->
+  <string name="walkthrough_activity_title">App walkthrough</string>
+  <string name="walkthrough_activity_welcome_description">Learn new math skills with stories that show you how to use them in your daily life</string>
+  <string name="walkthrough_activity_welcome_text">"Welcome %s!"</string>
+  <string name="walkthrough_activity_topic_header_text">What do you want to learn?</string>
+  <string name="walkthrough_activity_final_title_text">Great</string>
+  <string name="walkthrough_activity_get_started_text">Let’s get started.</string>
+  <string name="walkthrough_activity_yes_text">Yes</string>
+  <string name="walkthrough_activity_no_text">No…</string>
+  <string name="walkthrough_activity_pick_different_topic_text">Pick a \ndifferent topic.</string>
+  <string name="walkthrough_activity_are_you_interested_text">Are you interested in:\n%s?</string>
+  <string name="walkthrough_activity_back_button_text">Back Button</string>
+  <!-- GeneralStrings -->
   <string name="fraction_error_invalid_chars">Please only use numerical digits, spaces or forward slashes (/)</string>
   <string name="fraction_error_invalid_format">Please enter a valid fraction (e.g., 5/3 or 1 2/3)</string>
   <string name="fraction_error_divide_by_zero">Please do not put 0 in the denominator</string>
@@ -174,14 +548,23 @@
   <string name="ratio_error_invalid_colons" description="The error message for ratio when there is colons next to each other.">Your answer has two colons (:) next to each other.</string>
   <string name="ratio_error_invalid_size" description="The error message for ratio when there is less number of terms than the creator has specified in customization arg.">Number of terms is not equal to the required terms.</string>
   <string name="ratio_error_includes_zero" description="The error message for ratio when there is 0 term in the ratio.">Ratios cannot have 0 as an element.</string>
+  <string name="ratio_content_description_separator" description="The separator that would be used to build the text that would be read out for ratio interaction.For e.g if the input is 1:2:3 the read out text would be 1 to 2 to 3">\u0020to\u0020</string>
+  <string name="ratio_default_hint_text" description="The default hint text for the ratio interaction if the placeholder text is not available.">Enter a ratio in the form x:y.</string>
+  <string name="profile_last_visited">%s %s</string>
+  <string name="yesterday">yesterday</string>
+  <string name="last_logged_in_recently">recently</string>
+  <string name="coming_soon">Coming Soon</string>
+  <string name="recommended_stories">Recommended Stories</string>
+  <string name="stories_for_you">Stories For You</string>
   <string name="unknown_size">Unknown size</string>
   <string name="size_bytes">%s Bytes</string>
   <string name="size_kb">%s KB</string>
   <string name="size_mb">%s MB</string>
   <string name="size_gb">%s GB</string>
   <string name="correct">Correct!</string>
-  <string name="topic_prefix">Topic: %s</string>
+  <string name="just_now">just now</string>
   <string name="welcome_profile_name">%s %s!</string>
+  <string name="font_scale_html_content_text">html Content</string>
   <plurals name="chapter_count">
     <item quantity="one">1 Chapter</item>
     <item quantity="other">%s Chapters</item>
@@ -208,251 +591,6 @@
     <item quantity="other">%s Topics in Progress</item>
     <item quantity="zero">%s Topics in Progress</item>
   </plurals>
-  <string name="bar_separator">\u0020|\u0020</string>
-  <!-- ProfileChooserFragment -->
-  <string name="profile_chooser_activity_label">Profile selection page</string>
-  <string name="profile_chooser_admin">Administrator</string>
-  <string name="profile_chooser_select">Select your profile</string>
-  <string name="profile_chooser_add">Add Profile</string>
-  <string name="set_up_multiple_profiles">Set up Multiple Profiles</string>
-  <string name="set_up_multiple_profiles_description">Add up to 10 users to your account. Perfect for families and classrooms.</string>
-  <string name="profile_chooser_administrator_controls">Administrator Controls</string>
-  <string name="profile_chooser_language">Language</string>
-  <!-- AdminAuthActivity -->
-  <string name="admin_auth_toolbar">Administrator Controls</string>
-  <string name="admin_auth_activity_add_profiles_title">Authorise to add profiles</string>
-  <string name="admin_auth_activity_access_controls_title">Authorise to access Administrator Controls</string>
-  <string name="admin_auth_heading">Administrator Authorization Required</string>
-  <string name="admin_auth_sub">Enter the Administrator PIN in order to create a new account.</string>
-  <string name="admin_auth_admin_controls_sub">Enter the Administrator PIN in order to access Administrator Controls.</string>
-  <string name="admin_auth_pin">Administrator\'s PIN</string>
-  <string name="admin_auth_incorrect">Incorrect Administrator PIN. Please try again.</string>
-  <string name="admin_auth_null">Please enter Administrator PIN.</string>
-  <string name="admin_auth_submit">Submit</string>
-  <string name="admin_auth_close">Close</string>
-  <!-- AdminPinActivity -->
-  <string name="admin_pin_requirement_description">Before we add profiles, we need to protect your account by creating a PIN. This gives you the ability to authorize manage profiles on the device.</string>
-  <string name="admin_pin_pin_description">Do <b>not</b> use a PIN you have set for personal accounts like banking or social security.</string>
-  <string name="admin_pin_new_pin">New 5-Digit PIN</string>
-  <string name="admin_pin_new_confirm">Confirm 5-Digit PIN</string>
-  <string name="admin_pin_error_pin_length">Your PIN should be 5 digits long.</string>
-  <string name="admin_pin_error_pin_confirm_wrong">Please make sure that both PINs match.</string>
-  <string name="save">Save</string>
-  <string name="admin_pin_activity_title">Authorise to add profiles</string>
-  <!-- AddProfileActivity -->
-  <string name="add_profile_activity_label">Add Profile</string>
-  <string name="add_profile_title">Add Profile</string>
-  <string name="add_profile_input_name">Name</string>
-  <string name="add_profile_input_pin">3-Digit PIN</string>
-  <string name="add_profile_input_confirm_pin">Confirm 3-Digit PIN</string>
-  <string name="add_profile_allow_download_heading">Allow Download Access</string>
-  <string name="add_profile_allow_download_sub">User is able to download and delete content without Administrator PIN.</string>
-  <string name="add_profile_create_btn">Create</string>
-  <string name="add_profile_close">Close</string>
-  <string name="add_profile_pin_info">With a PIN, nobody else can access a profile besides this assigned user.</string>
-  <string name="add_profile_error_image_failed_store">We failed to store your avatar image. Please try again.</string>
-  <string name="add_profile_error_name_not_unique">This name is already in use by another profile.</string>
-  <string name="add_profile_error_name_empty">Please enter a valid name for this profile.</string>
-  <string name="add_profile_error_name_only_letters">Please choose a profile name that doesn\'t include numbers or symbols.</string>
-  <string name="add_profile_error_pin_length">Your PIN should be 3 digits long.</string>
-  <string name="add_profile_error_pin_confirm_wrong">Please make sure that both PINs match.</string>
-  <string name="add_profile_info_content_description">More information on 3-digit PINs.</string>
-  <string name="current_profile_picture_content_description">Current profile picture</string>
-  <string name="edit_profile_picture_content_description">Edit profile picture</string>
-  <!-- OnboardingActivity -->
-  <string name="onboarding_slide_0_title">Welcome to %s!</string>
-  <string name="onboarding_slide_0_description">Learn anything you want in an effective and enjoyable way.</string>
-  <string name="onboarding_slide_1_title">Add users to your account.</string>
-  <string name="onboarding_slide_1_description">Share the experience and create up to 10 profiles.</string>
-  <string name="onboarding_slide_2_title">Download for offline.</string>
-  <string name="onboarding_slide_2_description">Continue learning your lessons without internet connection.</string>
-  <string name="onboarding_slide_3_title">Have fun!</string>
-  <string name="onboarding_slide_3_description">Enjoy your learning adventures with our free, effective lessons.</string>
-  <string name="skip">Skip</string>
-  <string name="next_arrow">Next</string>
-  <string name="get_started">Get Started</string>
-  <string name="onboarding_slide_dots_content_description">Slide %s of %s</string>
-  <!-- PinPasswordActivity -->
-  <string name="pin_password_hello">Hi, %s!</string>
-  <string name="pin_password_admin_enter">Please enter your Administrator PIN.</string>
-  <string name="pin_password_user_enter">Please enter your PIN.</string>
-  <string name="input_pin_password_as_admin">Administrator’s 5-Digit PIN.</string>
-  <string name="input_pin_password_as_user">User’s 3-Digit PIN.</string>
-  <string name="pin_password_forgot_pin">Forgot PIN?</string>
-  <string name="pin_password_incorrect_pin">Incorrect PIN.</string>
-  <string name="pin_password_show">show</string>
-  <string name="pin_password_hide">hide</string>
-  <string name="pin_password_close">Close</string>
-  <string name="pin_password_success">PIN change is successful</string>
-  <string name="pin_password_forgot_title">Forgot PIN?</string>
-  <string name="admin_forgot_pin_message">To reset your PIN, you\'ll need to clear all saved data for %s.\n\nKeep in mind that this action will cause all profiles and user progress to be deleted, and it cannot be undone. Also, the app will close when this completes and will need to be reopened.</string>
-  <string name="admin_forgot_pin_reset_app_data_button_text">Reset %s Data</string>
-  <string name="admin_confirm_app_wipe_title">Confirm %s Data Reset</string>
-  <string name="admin_confirm_app_wipe_message">Are you sure that you want to delete all %s profiles on this device? This operation cannot be undone.</string>
-  <string name="admin_confirm_app_wipe_positive_button_text">Yes</string>
-  <string name="admin_confirm_app_wipe_negative_button_text">No</string>
-  <string name="show_hide_password_icon">Show/Hide password icon</string>
-  <string name="password_shown_icon">Password shown icon</string>
-  <string name="password_hidden_icon">Password hidden icon</string>
-  <string name="enter_your_pin">Enter your PIN</string>
-  <string name="pin_password_toolbar_title">Enter PIN</string>
-  <!-- AdminSettingsDialogFragment -->
-  <string name="admin_settings_label">Administrator\'s PIN</string>
-  <string name="admin_settings_heading">Access to Administrator Settings</string>
-  <string name="admin_settings_sub">Administrator\'s PIN required to change user\'s PIN</string>
-  <string name="admin_settings_cancel">Cancel</string>
-  <string name="admin_settings_submit">Submit</string>
-  <string name="admin_settings_incorrect">Incorrect Administrator PIN. Please try again.</string>
-  <string name="admin_settings_enter_user_new_pin">%1$s\'s New PIN.</string>
-  <!-- ResetPinDialogFragment -->
-  <string name="reset_pin_enter">Enter a New Pin</string>
-  <string name="reset_pin_enter_dialog_message">This PIN will be %s\'s new PIN and will be required when signing in.</string>
-  <!-- MyDownloadsActivity -->
-  <string name="my_downloads_activity_title">My Downloads</string>
-  <string name="tab_downloads">Downloads</string>
-  <string name="tab_updates">Updates (2)</string>
-  <!-- HomeActivityBackDialog -->
-  <string name="home_activity_back_dialog_message">Would you like to exit your profile?</string>
-  <string name="home_activity_back_dialog_cancel">Cancel</string>
-  <string name="home_activity_back_dialog_exit">Exit</string>
-  <!-- HomeActivity -->
-  <string name="home_activity_title">Home</string>
-  <string name="promoted_story_spotlight_hint">From now, you can see lessons recommended for you here.</string>
-  <string name="select_a_topic_to_start">Select a Topic to Start</string>
-  <!-- ProfileListActivity -->
-  <string name="profile_list_activity_title">Profiles</string>
-  <!-- ProfileEditActivity -->
-  <string name="profile_edit_activity_title">Edit Profile</string>
-  <string name="profile_edit_created">Created on %s</string>
-  <string name="profile_last_used">Last used </string>
-  <string name="profile_edit_rename">Rename</string>
-  <string name="profile_edit_reset">Reset PIN</string>
-  <string name="profile_edit_mark_chapter_completion">Mark Chapters Completed</string>
-  <string name="profile_edit_enable_quick_lesson_language_switching_label">Enable Quick Language Switching</string>
-  <string name="profile_edit_enable_quick_lesson_language_switching_explanation">Allow this user to quickly switch between English and Swahili within a lesson.</string>
-  <string name="profile_edit_delete">Profile Deletion</string>
-  <string name="profile_edit_delete_dialog_title">Permanently delete this profile?</string>
-  <string name="profile_edit_delete_dialog_message">All progress will be deleted and cannot be recovered.</string>
-  <string name="profile_edit_delete_dialog_positive">Delete</string>
-  <string name="profile_edit_delete_dialog_negative">Cancel</string>
-  <string name="profile_edit_allow_download_heading">Allow Download Access</string>
-  <string name="profile_edit_allow_download_sub">User is able to download and delete content without Administrator password</string>
-  <!-- ProfilePictureActivity -->
-  <string name="profile_picture_activity_title">Profile Picture</string>
-  <!-- ProfileProgressActivity -->
-  <string name="profile_progress_edit_dialog_title">Profile Picture</string>
-  <string name="profile_picture_edit_alert_dialog_cancel_button">Cancel</string>
-  <string name="profile_picture_edit_alert_dialog_view_profile_picture">View Profile Picture</string>
-  <string name="profile_picture_edit_alert_dialog_choose_from_library">Choose From Library</string>
-  <!-- ProfileRenameActivity -->
-  <string name="profile_rename_activity_title">Rename Profile</string>
-  <string name="profile_rename_label">New Name</string>
-  <string name="profile_rename_save">Save</string>
-  <!-- ProfileResetPinActivity -->
-  <string name="profile_reset_pin_activity_title">Reset PIN</string>
-  <string name="profile_reset_pin_main">Enter a new PIN for the user to enter when accessing their profile.</string>
-  <string name="profile_reset_pin_user_pin_label">3-Digit PIN</string>
-  <string name="profile_reset_pin_admin_pin_label">5-Digit PIN</string>
-  <string name="profile_reset_pin_user_confirm_label">Confirm 3-Digit PIN</string>
-  <string name="profile_reset_pin_admin_confirm_label">Confirm 5-Digit PIN</string>
-  <string name="profile_reset_pin_error_user_pin_length">Your PIN should be 3 digits long.</string>
-  <string name="profile_reset_pin_error_admin_pin_length">Your PIN should be 5 digits long.</string>
-  <string name="add_profile_create_a_3_digit_pin">Create a 3-Digit PIN</string>
-  <string name="add_profile_required">Required</string>
-  <string name="back_button">Back Button</string>
-  <string name="next">Next</string>
-  <!-- ProfileAndDeviceIDsActivity -->
-  <string name="learner_analytics_label_text">Learner Study Analytics</string>
-  <!-- AdministratorControlsFragment -->
-  <string name="administrator_controls_general_label">General</string>
-  <string name="administrator_controls_edit_account">Edit account</string>
-  <string name="administrator_controls_profile_management_label">Profile Management</string>
-  <string name="administrator_controls_edit_profiles">Edit profiles</string>
-  <string name="administrator_controls_download_permissions_label">Download Permissions</string>
-  <string name="administrator_controls_update_on_wifi_title">Download and update only on Wi-fi</string>
-  <string name="administrator_controls_update_on_wifi_message">Topics will be downloaded and updated only on Wi-fi. Any downloads or updates of cellular data will be queued.</string>
-  <string name="administrator_controls_auto_update_title">Automatically update topics</string>
-  <string name="administrator_controls_auto_update_message">Downloaded topics that have new content available will automatically update.</string>
-  <string name="administrator_controls_app_information_label">App Information</string>
-  <string name="administrator_controls_app_version">App Version</string>
-  <string name="administrator_controls_account_actions_label">Account Actions</string>
-  <string name="administrator_controls_log_out">Log Out</string>
-  <string name="log_out_dialog_cancel_button">Cancel</string>
-  <string name="log_out_dialog_okay_button">Ok</string>
-  <string name="log_out_dialog_message">Are you sure you want to log out of your profile?</string>
-  <!-- AppVersionFragment -->
-  <string name="app_version_name">App Version %s</string>
-  <string name="app_last_update_date">The last update was installed on %s. Use the above version number to send feedback about bugs.</string>
-  <string name="app_version_activity_title">App Version</string>
-  <!-- OptionsActivity -->
-  <string name="app_language_activity_title">App Language</string>
-  <string name="audio_language_activity_title">Preferred Audio Language</string>
-  <string name="reading_text_size_activity_title">Reading Text Size</string>
-  <string name="title_reading_text_size">Reading Text Size</string>
-  <string name="story_text_will_look_like_this">Story text will look like this.</string>
-  <string name="constant_string_for_text_size">A</string>
-  <string name="audio_language">Preferred Audio Language</string>
-  <string name="app_language">App Language</string>
-  <string name="reading_text_size">Reading Text Size</string>
-  <string name="reading_text_size_small">Small</string>
-  <string name="reading_text_size_medium">Medium</string>
-  <string name="reading_text_size_large">Large</string>
-  <string name="reading_text_size_extra_large">Extra Large</string>
-  <string name="slide_seekbar_to_control_text_size">Slide seekbar to control the text size.</string>
-  <string name="profile">Profile</string>
-  <string name="story_count_text_view">2 Stories</string>
-  <string name="topics_in_progress">Topics in Progress</string>
-  <string name="topic_in_progress">Topic in Progress</string>
-  <string name="stories_completed">Stories Completed</string>
-  <string name="story_completed">Story Completed</string>
-  <string name="options_activity_title">Options</string>
-  <!-- CompletedStoryListActivity -->
-  <string name="completed_story_list_activity_title">Stories Completed</string>
-  <!-- WalkthroughActivity -->
-  <string name="walkthrough_activity_title">App walkthrough</string>
-  <string name="walkthrough_welcome_description">Learn new math skills with stories that show you how to use them in your daily life</string>
-  <string name="welcome">"Welcome %s!"</string>
-  <!-- WalkthroughTopicListFragment -->
-  <string name="what_do_you_want_to_learn">What do you want to learn?</string>
-  <!-- WalkthroughEndFragment -->
-  <string name="great">Great</string>
-  <string name="lets_get_started">Let’s get started.</string>
-  <string name="yes">Yes</string>
-  <string name="no">No…</string>
-  <string name="pick_a_different_topic">Pick a \ndifferent topic.</string>
-  <string name="are_you_interested">Are you interested in:\n%s?</string>
-  <!-- HintsAndSolutionDialogFragment -->
-  <string name="new_hint_available">New hint available</string>
-  <string name="no_new_hint_available">No new hint available</string>
-  <string name="show_hints_and_solution">Show hints and solution</string>
-  <string name="hint_list_item_number">Hint %s</string>
-  <string name="hints_and_solution_close_icon_description">Close</string>
-  <string name="hints_toolbar_title">Hints</string>
-  <string name="show_solution">Show solution</string>
-  <string name="reveal_solution">Show Solution</string>
-  <string name="hint_list_solution_title">Solution</string>
-  <string name="reveal_hint">Show Hint</string>
-  <string name="hide_hint">Hide Hint</string>
-  <string name="hide_solution">Hide solution</string>
-  <string name="hints_list_exclusive_solution_text">The only solution is: %s</string>
-  <string name="hints_list_possible_solution_text">One solution is: %s</string>
-  <string name="this_will_reveal_the_solution">This will show the solution. Are you sure?</string>
-  <string name="reveal">Show</string>
-  <!-- TextViewBindingAdapters -->
-  <string name="just_now">just now</string>
-  <string name="last_logged_in_recently">recently</string>
-  <string name="yesterday">yesterday</string>
-  <string name="return_to_topic">Return to topic</string>
-  <string name="return_to_lesson">Return to lesson</string>
-  <string name="explanation">Explanation:</string>
-  <string name="drag_and_drop_interaction_group_merge_hint">If two items are equal, merge them.</string>
-  <string name="link_to_item_below">Link to item %s</string>
-  <string name="unlink_items">Unlink items at %s</string>
-  <string name="move_item_down_content_description">Move item down to %s</string>
-  <string name="move_item_up_content_description">Move item up to %s</string>
-  <string name="up_button_disabled">Up</string>
-  <string name="down_button_disabled">Down</string>
-  <string name="profile_last_visited">%s %s</string>
   <plurals name="minutes_ago">
     <item quantity="zero">0 minutes ago</item>
     <item quantity="one">a minute ago</item>
@@ -466,155 +604,13 @@
     <item quantity="one">a day ago</item>
     <item quantity="other">%s days ago</item>
   </plurals>
-  <!-- ViewTags -->
-  <string name="topic_revision_recyclerview_tag">topic_revision_recyclerview_tag</string>
-  <string name="ongoing_recycler_view_tag">ongoing_recycler_view_tag</string>
-  <string name="completed_story_list_recyclerview_tag">completed_story_list_recyclerview_tag</string>
-  <string name="item_selection_text">Please select all correct choices.</string>
-  <!-- SplashActivity -->
+  <!-- SharedStrings -->
+  <string name="menu_options_text">Options</string>
+  <string name="menu_help_text">Help</string>
+  <string name="navigate_up_text">Navigate up</string>
+  <string name="next_text">Next</string>
   <string name="unsupported_app_version_dialog_title" description="The title of the dialog shown when a user's pre-release app has expired.">Unsupported app version</string>
   <string name="unsupported_app_version_dialog_message" description="The main message of the dialog shown when a user's pre-release app has expired.">This version of the app is no longer supported. Please update it through the Play Store.</string>
   <string name="unsupported_app_version_dialog_close_button_text" description="The close button text of the dialog shown when a user's pre-release app has expired.">Close app</string>
-  <string name="forced_app_update_dialog_title" description="The title of the dialog shown when a user's pre-release app has expired.">App update required</string>
-  <string name="forced_app_update_dialog_message" description="The main message of the dialog shown when a user's app has expired.">A new version of %s is now available. The new version is more secure, and improves your learning experience.\n\nThis version is no longer supported. To continue using the app, please update to the latest version.</string>
-  <string name="forced_app_update_dialog_update_button_text" description="The update button text of the dialog shown when a user's pre-release app has expired.">Update</string>
-  <string name="forced_app_update_dialog_close_button_text" description="The close button text of the dialog shown when a user's pre-release app has expired.">Close app</string>
-  <string name="optional_app_update_dialog_title" description="The title of the dialog shown when an optional app update is available.">New update available</string>
-  <string name="optional_app_update_dialog_message" description="The main message of the dialog shown when an optional app update is available.">A new version of %s is now available. We recommend that you update the app for bug fixes and a better learning experience.</string>
-  <string name="optional_app_update_dialog_dismiss_button_text" description="The dismiss button text of the dialog shown when an optional app update is available.">Dismiss</string>
-  <string name="optional_app_update_dialog_update_button_text" description="The update button text of the dialog shown when an optional app update is available.">Update</string>
-  <string name="os_deprecation_dialog_title" description="The title of the dialog shown when an the OS the user is using is no longer supported.">Update your Android OS</string>
-  <string name="os_deprecation_dialog_message" description="The main message of the dialog shown when an the OS the user is using is no longer supported.">We recommend updating your Android OS to take advantage of %s\'s new features and lessons.\n\nVisit your phone\'s Settings app to update your OS.</string>
-  <string name="os_deprecation_dialog_dismiss_button_text" description="The dismiss button text of the dialog shown when an the OS the user is using is no longer supported.">Dismiss</string>
-  <string name="splash_screen_developer_label">Developer Build</string>
-  <string name="splash_screen_alpha_label">Alpha</string>
-  <string name="splash_screen_beta_label">Beta</string>
-  <string name="beta_notice_dialog_title">Beta Notice</string>
-  <string name="beta_notice_dialog_message">Hello! Your app is now being updated to the Beta version. If you experience problems while using the app, or have questions, please contact us at android-feedback@oppia.org.</string>
-  <string name="beta_notice_dialog_do_not_show_again_text">Don\'t show this message again</string>
-  <string name="beta_notice_dialog_close_button_text">OK</string>
-  <string name="general_availability_notice_dialog_title">General Availability Notice</string>
-  <string name="general_availability_notice_dialog_message">Hello! Your app is now being updated to the General Availability version. If you experience problems while using the app, or have questions, please contact us at android-feedback@oppia.org.</string>
-  <string name="general_availability_notice_dialog_do_not_show_again_text">Don\'t show this message again</string>
-  <string name="general_availability_notice_dialog_close_button_text">OK</string>
-  <string name="ratio_content_description_separator" description="The separator that would be used to build the text that would be read out for ratio interaction.For e.g if the input is 1:2:3 the read out text would be 1 to 2 to 3">\u0020to\u0020</string>
-  <string name="ratio_default_hint_text" description="The default hint text for the ratio interaction if the placeholder text is not available.">Enter a ratio in the form x:y.</string>
-  <string name="text_input_default_hint_text">Tap here to enter text.</string>
-  <string name="test_number_input_interaction_hint">Write the digit here.</string>
-  <string name="test_text_input_interaction_hint">Write here.</string>
-  <string name="smallest_text_size_content_description">Smallest text size</string>
-  <string name="largest_text_size_content_description">Largest text size</string>
-  <string name="coming_soon">Coming Soon</string>
-  <string name="recommended_stories">Recommended Stories</string>
-  <string name="stories_for_you">Stories For You</string>
-  <string name="question_player_activity_title">Practice Mode</string>
-  <string name="revision_card_activity_title">Skill revision page</string>
-  <string name="audio_player_seekbar_content_description">Audio progress</string>
-  <string name="audio_language_icon_content_description">Change language</string>
-  <string name="audio_player_on">Audio, ON</string>
-  <string name="audio_player_off">Audio, OFF</string>
-  <string name="correct_submitted_answer">Correct submitted answer</string>
-  <string name="correct_submitted_answer_with_append">Correct submitted answer: %s</string>
-  <string name="incorrect_submitted_answer">Incorrect submitted answer</string>
-  <string name="incorrect_submitted_answer_with_append">Incorrect submitted answer: %s</string>
-  <!-- ThirdPartyDependencyListActivity -->
-  <string name="third_party_dependency_list_activity_title">Third-party Dependencies</string>
-  <string name="third_party_dependency_version_formatter">version %s</string>
-  <!-- LicenseListActivity -->
-  <string name="license_list_activity_title">Copyright Licenses</string>
-  <!-- LicenseTextViewerActivity -->
-  <string name="license_text_viewer_activity_title">Copyright License Viewer</string>
-  <!-- HelpActivity -->
-  <string name="help_activity_back_arrow_description">Navigate back to %s</string>
-  <string name="help_activity_third_party_dependencies_list">third-party dependencies list</string>
-  <string name="help_activity_copyright_licenses_list">copyright licenses list</string>
-  <!-- ResumeLessonActivity -->
-  <string name="resume_lesson_activity_title">Resume Lesson</string>
-  <string name="resume_lesson_button">Continue</string>
-  <string name="start_over_lesson_button">Start Over</string>
-  <!-- Home screen greeting fragments. -->
-  <string name="home_screen_good_morning_greeting_fragment">Good morning,</string>
-  <string name="home_screen_good_afternoon_greeting_fragment">Good afternoon,</string>
-  <string name="home_screen_good_evening_greeting_fragment">Good evening,</string>
-  <!-- Privacy Policy -->
-  <string name="policy_activity_title">Policy Page</string>
-  <string name="privacy_policy_title">Privacy Policy</string>
-  <string name="privacy_policy_web_link"><![CDATA[Please visit <a href="https://www.oppia.org/privacy-policy">this page</a> for the latest version of this privacy policy.]]></string>
-  <!-- Terms of Service -->
-  <string name="terms_of_service_title">Terms of Service</string>
-  <string name="agree_to_terms"><![CDATA[By using %s, you agree to our <br> <oppia-noninteractive-policy link="tos">Terms of Service</oppia-noninteractive-policy> and <oppia-noninteractive-policy link="privacy">Privacy Policy</oppia-noninteractive-policy>.]]></string>
-  <string name="terms_of_service_web_link"><![CDATA[Please visit <a href="https://www.oppia.org/terms">this page</a> for the latest version of these terms.]]></string>
-  <!-- Frequently asked questions & generic app help. -->
-  <string name="faq_question_1">How can I create a new profile?</string>
-  <string name="faq_question_2">How can I delete a profile?</string>
-  <string name="faq_question_3">How can I change my email/phone number?</string>
-  <string name="faq_question_4">What is %s?</string>
-  <string name="faq_question_5">Who is an Administrator?</string>
-  <string name="faq_question_6">Why is the Exploration player not loading?</string>
-  <string name="faq_question_7">Why is my audio not playing?</string>
-  <string name="faq_question_9">I can\'t find my question here. What now?</string>
-  <string name="faq_answer_1"><![CDATA[<p>If it is your first time creating a profile and not have a PIN:<ol><li>From the Profile Chooser, tap on <strong>Set up Multiple Profiles</strong>.</li><li>Create a PIN and <strong>Save</strong>.</li><li>Fill in all fields for the profile.<ol><li>(Optional) Upload a photo.</li><li>Enter a name.</li><li>(Optional) Assign a 3-digit PIN.</li></ol></li><li>Tap <strong>Create</strong>. This profile is added to your Profile Chooser!</li></ol></p><p> If you have created a profile before and have a PIN:<ol><li>From the Profile Chooser, tap on <strong>Add Profile</strong>. </li><li>Enter your PIN and tap <strong>Submit</strong>. </li><li>Fill in all fields for the profile.<ol><li> (Optional) Upload a photo. </li><li> Enter a name. </li><li> (Optional) Assign a 3-digit PIN. </li></ol></li><li>Tap <strong>Create</strong>. This profile is added to your Profile Chooser!</li></ol></p><br><p>Note: Only the <u>Administrator</u> is able to manage profiles.</p>]]></string>
-  <string name="faq_answer_2"><![CDATA[<p>Once a profile is deleted:</p><ol><li>The profile cannot be recovered. </li><li> Profile information such as name, photos, and progress will be permanently deleted. </li></ol><p>To delete a profile (excluding the <u>Administrator\'s</u>):</p><ol><li> From the Administrator\'s Home Page, tap on the menu button on the top left. </li><li>Tap on <strong>Administrator Controls</strong>. </li><li>Tap on <strong>Edit Profiles</strong>. </li><li>Tap on the Profile you would like to delete. </li><li>At the bottom of the screen, tap <strong>Profile Deletion</strong>. </li><li>Tap <strong>Delete</strong> to confirm deletion. </li></ol><p><br></p><p>Note: Only the <u>Administrator</u> is able to manage profiles.</p>]]></string>
-  <string name="faq_answer_3"><![CDATA[<p>To change your email/phone number:</p><ol><li>From the Administrator\'s Home Page, tap on the menu button on the top left.</li><li>Tap on <strong>Administrator Controls</strong>.</li><li>Tap on <strong>Edit Account</strong>.</li></ol><p><br></p> <p>If you want to change your email:</p><ol><li>Enter your new email and tap <strong>Save</strong>.</li><li>A confirmation link is sent to confirm your new email. The link will expire after 24 hours and must be clicked on to be associated with your account.</li></ol><p><br></p> <p>If changing your phone number:</p><ol><li> Enter your new phone number and tap <strong>Verify</strong>.</li><li> A code is sent to confirm your new number. The code will expire after 5 minutes and must be entered in the new screen to be associated with your account.</li></ol>]]></string>
-  <string name="faq_answer_4"><![CDATA[<p>%1$s <i>"O-pee-yah"</i> (Finnish) - "to learn"</p><p><br></p><p>%1$s\'s mission is to help anyone learn anything they want in an effective and enjoyable way.</p><p><br></p><p>By creating a set of free, high-quality, demonstrably effective lessons with the help of educators from around the world, %1$s aims to provide students with quality education — regardless of where they are or what traditional resources they have access to.</p><p><br></p><p>As a student, you can begin your learning adventure by browsing the topics listed on the Home Page!</p>]]></string>
-  <string name="faq_answer_5"><![CDATA[<p>An Administrator is the main user that manages profiles and settings for every profile on their account. They are most likely your parent, teacher, or guardian that created this profile for you. </p><p><br></p><p>Administrators have the ability to manage profiles, assign PINs, and change other settings under their account. Depending on your profile, Administrator permissions may be required for certain features such as changing your PIN, and more. </p><p><br></p><p>To see who your Administrator is, go to the Profile Chooser. The first profile listed and has "Administrator" written under their name is the Administrator. </p>]]></string>
-  <string name="faq_answer_6"><![CDATA[<p>If the Exploration Player is not loading</p><p><br></p><p>Check to see if the app is up to date:</p><p><ul><li> Go to the Play Store and make sure the app is updated to its latest version </li></ul><p><br></p><p>Check your internet connection:</p><ul><li> If your internet connection is slow, try re-connecting to your Wi-Fi network or connecting to a different network. </li></ul><p>Ask the Administrator to check their device and internet connection:</p><ul><li> Get the Administrator to troubleshoot using the steps above </li></ul><p>Let us know if you still have issues with loading:</p><ul><li> Report a problem by contacting us at admin@oppia.org. </li></ul>]]></string>
-  <string name="faq_answer_7"><![CDATA[<p>If your audio is not playing</p><p><br></p><p>Check to see if the app is up to date:</p><ul><li> Go to the Play Store and make sure the app is updated to its latest version </li></ul><p><br></p><p>Check your internet connection:</p><ul><li> If your internet connection is slow, try re-connecting to your Wi-Fi network or connecting to a different network. Slow internet may cause the audio to load irregularly, making it difficult to play. </li></ul><p><br></p><p>Ask the Administrator to check their device and internet connection:</p><ul><li> Get the Administrator to troubleshoot using the steps above</li></ul><p><br></p><p>Let us know if you still have issues with loading:</p><ul><li> Report a problem by contacting us at admin@oppia.org. </li></ul>]]></string>
-  <string name="faq_answer_9"><![CDATA[<p>If you cannot find your question or would like to report a bug, contact us at admin@oppia.org.</p>]]></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>
-  <string name="revision_navigation_cards_header">Continue Studying</string>
-  <string name="state_fragment_hint_bar_forced_announcement_text">Go to the bottom of the screen for a hint.</string>
-  <string name="state_fragment_item_selection_no_items_selected_hint_text">Please select all correct choices.</string>
-  <string name="state_fragment_item_selection_some_items_selected_hint_text">You may select more choices.</string>
-  <string name="state_fragment_item_selection_max_items_selected_hint_text">No more than %s choices may be selected.</string>
-  <string name="survey_activity_title">Survey</string>
-  <string name="survey_previous_button">Previous</string>
-  <string name="survey_submit_button">Submit</string>
-  <string name="survey_free_form_text_hint">Leave your feedback here</string>
-  <string name="survey_continue_survey_button">Continue Survey</string>
-  <string name="survey_exit_button">Exit</string>
-  <string name="survey_exit_button_description">Exit Survey</string>
-  <string name="survey_exit_confirmation_text">Are you sure you want to exit the survey?</string>
-  <string name="survey_onboarding_message_text">Your feedback helps us serve learners like you better. Would you like to complete a short survey about your experience?</string>
-  <string name="survey_begin_survey_button">Begin Survey</string>
-  <string name="survey_maybe_later_button">Maybe Later</string>
-  <string name="survey_thank_you_message_text">Thank you for completing the survey. We hope you\'ve enjoyed using %s!</string>
-  <string name="survey_exit_survey_button">Exit survey</string>
-  <string name="survey_onboarding_title_text">We\'d love your feedback!</string>
-  <string name="survey_thank_you_title_text">Thank you</string>
-  <string name="survey_nps_not_at_all_likely_label">0 - Not at all likely</string>
-  <string name="survey_nps_extremely_likely_label">10 - Extremely likely</string>
-  <string name="user_type_question">Please select one of the following:</string>
-  <string name="user_type_answer_learner">I am a learner</string>
-  <string name="user_type_answer_teacher">I am a teacher</string>
-  <string name="user_type_answer_parent">I am a parent</string>
-  <string name="user_type_answer_other">Other</string>
-  <string name="market_fit_question">How would you feel if you could no longer use %s?</string>
-  <string name="market_fit_answer_very_disappointed">Very disappointed</string>
-  <string name="market_fit_answer_somewhat_disappointed">Somewhat disappointed</string>
-  <string name="market_fit_answer_not_disappointed">Not disappointed</string>
-  <string name="market_fit_answer_wont_use_oppia">N/A - I don\’t use %s anymore</string>
-  <string name="nps_promoter_feedback_question">We are glad you have enjoyed your experience with %s. Please share what helped you the most:</string>
-  <string name="nps_passive_feedback_question">Thanks for responding! How can we provide a better experience?</string>
-  <string name="nps_detractor_feedback_question">Help us improve your experience! Please share  the primary reason for your score:</string>
-  <string name="nps_score_question">On a scale from 0–10, how likely are you to recommend %s to a friend or colleague?</string>
-  <string name="previous_subtopic_talkback_text">The previous subtopic is %s</string>
-  <string name="next_subtopic_talkback_text">The next subtopic is %s</string>
-
-  <string name="app_info_icon_content_description">App Info</string>
-  <string name="spotlight_overlay_arrow_content_description">Spotlight Overlay Arrow</string>
-  <string name="close_spotlight_button_content_description">Close Spotlight Button</string>
-  <string name="previous_state_navigation_button_content_description">Previous State Navigation Button</string>
-  <string name="developer_options_icon_content_description">Developer Options Icon</string>
-  <string name="administrator_controls_icon_content_description">Administrator Controls Icon</string>
   <string name="options_menu_content_description">Options Menu</string>
-  <string name="previous_button_content_description">Previous Button</string>
-  <string name="next_button_content_description">Next Button</string>
-  <string name="language_icon_content_description">Language Icon</string>
-  <string name="setting_icon_content_description">Setting Icon</string>
-  <string name="profile_picture_image_view_content_description">Profile Picture Image View</string>
-  <string name="lock_icon_content_description">Lock Icon</string>
-  <string name="download_status_image_content_description">Download Status</string>
-  <string name="font_scale_html_content_text">html Content</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 815ceccc4b7..2bf1d7dc1f1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -85,7 +85,7 @@
     <item name="android:layout_marginEnd">4dp</item>
     <item name="android:layout_marginTop">4dp</item>
     <item name="android:background">@drawable/previous_next_state_image_view_background</item>
-    <item name="android:contentDescription">@string/previous_state_description</item>
+    <item name="android:contentDescription">@string/state_fragment_previous_state_button_description</item>
     <item name="android:padding">12dp</item>
     <item name="srcCompat">@drawable/ic_arrow_back_oppia_dark_blue_24dp</item>
   </style>
@@ -97,7 +97,7 @@
     <item name="android:layout_marginEnd">4dp</item>
     <item name="android:layout_marginTop">4dp</item>
     <item name="android:background">@drawable/previous_next_state_image_view_background</item>
-    <item name="android:contentDescription">@string/next_state_description</item>
+    <item name="android:contentDescription">@string/state_fragment_next_state_button_description</item>
     <item name="android:padding">12dp</item>
     <item name="srcCompat">@drawable/ic_arrow_forward_oppia_dark_blue_24dp</item>
   </style>
diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt
index 7eed7b8f290..a43a23bf647 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityTest.kt
@@ -170,7 +170,7 @@ class AdministratorControlsActivityTest {
 
     // Verify that the activity label is correct as a proxy to verify TalkBack will announce the
     // correct string when it's read out.
-    assertThat(title).isEqualTo(context.getString(R.string.administrator_controls_title))
+    assertThat(title).isEqualTo(context.getString(R.string.administrator_controls_activity_title))
   }
 
   @Before
@@ -220,7 +220,7 @@ class AdministratorControlsActivityTest {
       verifyTextOnAdministratorListItemAtPosition(
         itemPosition = 0,
         targetViewId = R.id.edit_account_text_view,
-        stringIdToMatch = R.string.administrator_controls_edit_account
+        stringIdToMatch = R.string.administrator_controls_fragment_edit_account_text
       )
     }
   }
@@ -261,7 +261,7 @@ class AdministratorControlsActivityTest {
       verifyTextOnAdministratorListItemAtPosition(
         itemPosition = 1,
         targetViewId = R.id.edit_profiles_text_view,
-        stringIdToMatch = R.string.administrator_controls_edit_profiles
+        stringIdToMatch = R.string.administrator_controls_fragment_edit_profiles_text
       )
     }
   }
@@ -276,8 +276,8 @@ class AdministratorControlsActivityTest {
       testCoroutineDispatchers.runCurrent()
       scrollToPosition(position = 3)
       onView(withId(R.id.log_out_text_view)).perform(click())
-      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_message)
-      onView(withText(R.string.log_out_dialog_okay_button)).perform(click())
+      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_message_text)
+      onView(withText(R.string.log_out_dialog_okay_button_text)).perform(click())
       intended(hasComponent(ProfileChooserActivity::class.java.name))
     }
   }
@@ -306,7 +306,13 @@ class AdministratorControlsActivityTest {
       it.openNavigationDrawer()
       onView(withId(R.id.administrator_controls_linear_layout)).perform(nestedScrollTo())
         .perform(click())
-      onView(withText(context.getString(R.string.administrator_controls_edit_account)))
+      onView(
+        withText(
+          context.getString(
+            R.string.administrator_controls_fragment_edit_account_text
+          )
+        )
+      )
         .check(matches(isDisplayed()))
     }
   }
@@ -321,9 +327,9 @@ class AdministratorControlsActivityTest {
       testCoroutineDispatchers.runCurrent()
       scrollToPosition(position = 3)
       onView(withId(R.id.log_out_text_view)).perform(click())
-      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_message)
-      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_okay_button)
-      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_cancel_button)
+      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_message_text)
+      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_okay_button_text)
+      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_cancel_button_text)
     }
   }
 
@@ -339,9 +345,9 @@ class AdministratorControlsActivityTest {
       onView(isRoot()).perform(orientationLandscape())
       scrollToPosition(position = 3)
       onView(withId(R.id.log_out_text_view)).perform(click())
-      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_message)
-      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_okay_button)
-      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_cancel_button)
+      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_message_text)
+      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_okay_button_text)
+      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_cancel_button_text)
     }
   }
 
@@ -356,9 +362,9 @@ class AdministratorControlsActivityTest {
       scrollToPosition(position = 3)
       onView(withId(R.id.log_out_text_view)).perform(click())
       onView(isRoot()).perform(orientationLandscape())
-      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_message)
-      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_okay_button)
-      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_cancel_button)
+      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_message_text)
+      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_okay_button_text)
+      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_cancel_button_text)
     }
   }
 
@@ -372,8 +378,8 @@ class AdministratorControlsActivityTest {
       testCoroutineDispatchers.runCurrent()
       scrollToPosition(position = 3)
       onView(withId(R.id.log_out_text_view)).perform(click())
-      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_message)
-      onView(withText(R.string.log_out_dialog_cancel_button)).perform(click())
+      verifyTextInDialog(textInDialogId = R.string.log_out_dialog_message_text)
+      onView(withText(R.string.log_out_dialog_cancel_button_text)).perform(click())
       onView(withId(R.id.log_out_text_view)).check(matches(isDisplayed()))
     }
   }
@@ -464,7 +470,7 @@ class AdministratorControlsActivityTest {
       )
     ).use {
       onView(withId(R.id.extra_controls_title))
-        .check(matches(withText(R.string.administrator_controls_edit_profiles)))
+        .check(matches(withText(R.string.administrator_controls_fragment_edit_profiles_text)))
     }
   }
 
@@ -478,7 +484,7 @@ class AdministratorControlsActivityTest {
     ).use {
       onView(isRoot()).perform(orientationLandscape())
       onView(withId(R.id.extra_controls_title))
-        .check(matches(withText(R.string.administrator_controls_edit_profiles)))
+        .check(matches(withText(R.string.administrator_controls_fragment_edit_profiles_text)))
     }
   }
 
@@ -698,7 +704,7 @@ class AdministratorControlsActivityTest {
       ).perform(click())
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.profile_delete_button)).perform(click())
-      onView(withText(R.string.profile_edit_delete_dialog_message))
+      onView(withText(R.string.profile_edit_activity_dialog_message))
         .inRoot(isDialog())
         .check(
           matches(
@@ -723,7 +729,7 @@ class AdministratorControlsActivityTest {
       ).perform(click())
       onView(withId(R.id.profile_delete_button)).perform(scrollTo()).perform(click())
       testCoroutineDispatchers.runCurrent()
-      onView(withText(R.string.profile_edit_delete_dialog_message))
+      onView(withText(R.string.profile_edit_activity_dialog_message))
         .inRoot(isDialog())
         .check(
           matches(
@@ -749,7 +755,7 @@ class AdministratorControlsActivityTest {
       testCoroutineDispatchers.runCurrent()
       onView(isRoot()).perform(orientationLandscape())
       testCoroutineDispatchers.runCurrent()
-      onView(withText(R.string.profile_edit_delete_dialog_message))
+      onView(withText(R.string.profile_edit_activity_dialog_message))
         .inRoot(isDialog())
         .check(
           matches(
@@ -787,12 +793,12 @@ class AdministratorControlsActivityTest {
         R.id.profile_list_admin_text
       )
     ).check(
-      matches(withText(context.resources.getString(R.string.profile_chooser_admin)))
+      matches(withText(context.resources.getString(R.string.profile_chooser_fragment_admin_text)))
     )
   }
 
   private fun ActivityScenario<AdministratorControlsActivity>.openNavigationDrawer() {
-    onView(withContentDescription(R.string.drawer_open_content_description))
+    onView(withContentDescription(R.string.navigation_drawer_fragment_open_content_description))
       .check(matches(isCompletelyDisplayed()))
       .perform(click())
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentTest.kt
index 14feb91afcc..37398e62d50 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AdministratorControlsFragmentTest.kt
@@ -178,7 +178,7 @@ class AdministratorControlsFragmentTest {
       verifyTextOnAdministratorListItemAtPosition(
         itemPosition = 0,
         targetViewId = R.id.edit_account_text_view,
-        stringIdToMatch = R.string.administrator_controls_edit_account
+        stringIdToMatch = R.string.administrator_controls_fragment_edit_account_text
       )
       verifyItemDisplayedOnAdministratorControlListItem(
         itemPosition = 1,
@@ -187,7 +187,7 @@ class AdministratorControlsFragmentTest {
       verifyTextOnAdministratorListItemAtPosition(
         itemPosition = 1,
         targetViewId = R.id.edit_profiles_text_view,
-        stringIdToMatch = R.string.administrator_controls_edit_profiles
+        stringIdToMatch = R.string.administrator_controls_fragment_edit_profiles_text
       )
     }
   }
@@ -203,7 +203,7 @@ class AdministratorControlsFragmentTest {
       verifyTextOnAdministratorListItemAtPosition(
         itemPosition = 2,
         targetViewId = R.id.download_permissions_text_view,
-        stringIdToMatch = R.string.administrator_controls_download_permissions_label
+        stringIdToMatch = R.string.administrator_controls_fragment_download_permissions_label
       )
       verifyItemDisplayedOnAdministratorControlListItem(
         itemPosition = 2,
@@ -254,7 +254,7 @@ class AdministratorControlsFragmentTest {
       verifyTextOnAdministratorListItemAtPosition(
         itemPosition = 3,
         targetViewId = R.id.app_version_text_view,
-        stringIdToMatch = R.string.administrator_controls_app_version
+        stringIdToMatch = R.string.administrator_controls_fragment_app_version_text
       )
       verifyItemDisplayedOnAdministratorControlListItem(
         itemPosition = 4,
@@ -263,7 +263,7 @@ class AdministratorControlsFragmentTest {
       verifyTextOnAdministratorListItemAtPosition(
         itemPosition = 4,
         targetViewId = R.id.log_out_text_view,
-        stringIdToMatch = R.string.administrator_controls_log_out
+        stringIdToMatch = R.string.administrator_controls_fragment_log_out_text
       )
     }
   }
diff --git a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AppVersionActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AppVersionActivityTest.kt
index d6b1beaee52..bdf457775c6 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AppVersionActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/administratorcontrols/AppVersionActivityTest.kt
@@ -179,7 +179,7 @@ class AppVersionActivityTest {
       onView(
         withText(
           String.format(
-            context.resources.getString(R.string.app_version_name),
+            context.resources.getString(R.string.app_version_fragment_version_name_text),
             context.getVersionName()
           )
         )
@@ -187,7 +187,7 @@ class AppVersionActivityTest {
       onView(
         withText(
           String.format(
-            context.resources.getString(R.string.app_last_update_date),
+            context.resources.getString(R.string.app_version_fragment_last_update_date_text),
             lastUpdateDate
           )
         )
@@ -210,7 +210,7 @@ class AppVersionActivityTest {
         matches(
           withText(
             String.format(
-              context.resources.getString(R.string.app_version_name),
+              context.resources.getString(R.string.app_version_fragment_version_name_text),
               context.getVersionName()
             )
           )
@@ -224,7 +224,7 @@ class AppVersionActivityTest {
         matches(
           withText(
             String.format(
-              context.resources.getString(R.string.app_last_update_date),
+              context.resources.getString(R.string.app_version_fragment_last_update_date_text),
               lastUpdateDate
             )
           )
@@ -246,7 +246,7 @@ class AppVersionActivityTest {
           3
         )
       )
-      onView(withText(R.string.administrator_controls_app_version)).perform(click())
+      onView(withText(R.string.administrator_controls_fragment_app_version_text)).perform(click())
       intended(hasComponent(AppVersionActivity::class.java.name))
       onView(isRoot()).perform(pressBack())
       onView(withId(R.id.administrator_controls_list)).check(matches(isDisplayed()))
diff --git a/app/src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsActivityTest.kt
index d50f6dfa630..8104b1a0d9e 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/devoptions/DeveloperOptionsActivityTest.kt
@@ -233,7 +233,7 @@ class DeveloperOptionsActivityTest {
   }
 
   private fun ActivityScenario<DeveloperOptionsActivity>.openNavigationDrawer() {
-    onView(withContentDescription(R.string.drawer_open_content_description))
+    onView(withContentDescription(R.string.navigation_drawer_fragment_open_content_description))
       .check(matches(isCompletelyDisplayed()))
       .perform(click())
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt
index 32d89e32dd8..d39b9d67732 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/faq/FAQListFragmentTest.kt
@@ -136,7 +136,7 @@ class FAQListFragmentTest {
           position = 0,
           targetViewId = R.id.faq_question_text_view
         )
-      ).check(matches(withText(R.string.featured_questions)))
+      ).check(matches(withText(R.string.faq_list_activity_item_header_text)))
     }
   }
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt
index 7730b85edf8..0f600ff9f68 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/help/HelpFragmentTest.kt
@@ -217,7 +217,7 @@ class HelpFragmentTest {
           targetViewId = R.id.help_item_text_view
         )
       ).check(
-        matches(withText(R.string.frequently_asked_questions_FAQ))
+        matches(withText(R.string.help_activity_faq_text))
       )
     }
   }
@@ -240,7 +240,7 @@ class HelpFragmentTest {
           position = 0,
           targetViewId = R.id.help_item_text_view
         )
-      ).check(matches(withText(R.string.frequently_asked_questions_FAQ)))
+      ).check(matches(withText(R.string.help_activity_faq_text)))
     }
   }
 
@@ -1112,7 +1112,7 @@ class HelpFragmentTest {
           position = 2,
           targetViewId = R.id.help_item_text_view
         )
-      ).check(matches(withText(R.string.privacy_policy_title)))
+      ).check(matches(withText(R.string.policy_activity_privacy_policy_title)))
     }
   }
 
@@ -1134,7 +1134,7 @@ class HelpFragmentTest {
           position = 3,
           targetViewId = R.id.help_item_text_view
         )
-      ).check(matches(withText(R.string.terms_of_service_title)))
+      ).check(matches(withText(R.string.policy_activity_terms_of_service_title)))
     }
   }
 
@@ -1155,7 +1155,7 @@ class HelpFragmentTest {
       ).perform(click())
       onView(withId(R.id.help_multipane_options_title_textview)).check(
         matches(
-          withText(R.string.terms_of_service_title)
+          withText(R.string.policy_activity_terms_of_service_title)
         )
       )
       onView(withId(R.id.policy_description_text_view)).check(matches(isDisplayed()))
@@ -1180,7 +1180,7 @@ class HelpFragmentTest {
       onView(isRoot()).perform(orientationLandscape())
       onView(withId(R.id.help_multipane_options_title_textview)).check(
         matches(
-          withText(R.string.terms_of_service_title)
+          withText(R.string.policy_activity_terms_of_service_title)
         )
       )
       onView(withId(R.id.policy_description_text_view)).check(matches(isDisplayed()))
@@ -1205,7 +1205,7 @@ class HelpFragmentTest {
           targetViewId = R.id.help_item_text_view
         )
       ).check(
-        matches(withText(R.string.privacy_policy_title))
+        matches(withText(R.string.policy_activity_privacy_policy_title))
       )
     }
   }
@@ -1228,7 +1228,7 @@ class HelpFragmentTest {
           targetViewId = R.id.help_item_text_view
         )
       ).check(
-        matches(withText(R.string.terms_of_service_title))
+        matches(withText(R.string.policy_activity_terms_of_service_title))
       )
     }
   }
@@ -1310,7 +1310,7 @@ class HelpFragmentTest {
       ).perform(click())
       onView(withId(R.id.help_multipane_options_title_textview)).check(
         matches(
-          withText(R.string.privacy_policy_title)
+          withText(R.string.policy_activity_privacy_policy_title)
         )
       )
       onView(withId(R.id.policy_description_text_view)).check(matches(isDisplayed()))
@@ -1335,7 +1335,7 @@ class HelpFragmentTest {
       onView(isRoot()).perform(orientationLandscape())
       onView(withId(R.id.help_multipane_options_title_textview)).check(
         matches(
-          withText(R.string.privacy_policy_title)
+          withText(R.string.policy_activity_privacy_policy_title)
         )
       )
       onView(withId(R.id.policy_description_text_view)).check(matches(isDisplayed()))
@@ -1373,7 +1373,7 @@ class HelpFragmentTest {
   }
 
   private fun ActivityScenario<HelpActivity>.openNavigationDrawer() {
-    onView(withContentDescription(R.string.drawer_open_content_description))
+    onView(withContentDescription(R.string.navigation_drawer_fragment_open_content_description))
       .check(matches(isCompletelyDisplayed()))
       .perform(click())
 
@@ -1408,12 +1408,12 @@ class HelpFragmentTest {
 
   private fun retrieveThirdPartyDependenciesListString(): String {
     val res = ApplicationProvider.getApplicationContext<TestApplication>().resources
-    return res.getString(R.string.help_activity_third_party_dependencies_list)
+    return res.getString(R.string.help_activity_third_party_dependencies_text)
   }
 
   private fun retrieveCopyrightLicensesListString(): String {
     val res = ApplicationProvider.getApplicationContext<TestApplication>().resources
-    return res.getString(R.string.help_activity_copyright_licenses_list)
+    return res.getString(R.string.help_activity_copyright_licenses_text)
   }
 
   private fun setUpTestApplicationComponent() {
diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
index 8e7bf121487..2f2f5a30456 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/home/HomeActivityTest.kt
@@ -357,7 +357,7 @@ class HomeActivityTest {
     logIntoUserTwice()
     launch<HomeActivity>(createHomeActivityIntent(internalProfileId1)).use {
       testCoroutineDispatchers.runCurrent()
-      onView(withText(R.string.promoted_story_spotlight_hint))
+      onView(withText(R.string.home_story_promoted_story_spotlight_hint))
         .check(matches(isDisplayed()))
     }
   }
@@ -374,7 +374,7 @@ class HomeActivityTest {
     // Re-launch the activity.
     launch<HomeActivity>(createHomeActivityIntent(internalProfileId1)).use {
       testCoroutineDispatchers.runCurrent()
-      onView(withText(R.string.promoted_story_spotlight_hint)).check(doesNotExist())
+      onView(withText(R.string.home_story_promoted_story_spotlight_hint)).check(doesNotExist())
     }
   }
 
@@ -382,7 +382,7 @@ class HomeActivityTest {
   fun testPromotedStoriesSpotlight_setToShowOnSecondLogin_checkNotShownOnFirstLogin() {
     launch<HomeActivity>(createHomeActivityIntent(internalProfileId1)).use {
       testCoroutineDispatchers.runCurrent()
-      onView(withText(R.string.promoted_story_spotlight_hint)).check(doesNotExist())
+      onView(withText(R.string.home_story_promoted_story_spotlight_hint)).check(doesNotExist())
     }
   }
 
@@ -404,7 +404,7 @@ class HomeActivityTest {
       verifyExactTextOnHomeListItemAtPosition(
         itemPosition = 1,
         targetViewId = R.id.recently_played_stories_text_view,
-        stringToMatch = context.getString(R.string.recently_played_stories)
+        stringToMatch = context.getString(R.string.home_activity_recently_played_stories)
       )
     }
   }
@@ -428,7 +428,7 @@ class HomeActivityTest {
       verifyExactTextOnHomeListItemAtPosition(
         itemPosition = 1,
         targetViewId = R.id.view_all_text_view,
-        stringToMatch = context.getString(R.string.view_all)
+        stringToMatch = context.getString(R.string.home_activity_view_all_text)
       )
     }
   }
@@ -452,7 +452,7 @@ class HomeActivityTest {
       verifyExactTextOnHomeListItemAtPosition(
         itemPosition = 1,
         targetViewId = R.id.recently_played_stories_text_view,
-        stringToMatch = context.getString(R.string.last_played_stories)
+        stringToMatch = context.getString(R.string.home_activity_last_played_stories)
       )
     }
   }
@@ -1229,7 +1229,7 @@ class HomeActivityTest {
     launch<HomeActivity>(createHomeActivityIntent(internalProfileId1)).use {
       testCoroutineDispatchers.runCurrent()
       pressBack()
-      onView(withText(R.string.home_activity_back_dialog_exit))
+      onView(withText(R.string.home_activity_back_dialog_exit_button))
         .inRoot(isDialog())
         .perform(click())
       intended(hasComponent(ProfileChooserActivity::class.java.name))
@@ -1308,7 +1308,7 @@ class HomeActivityTest {
       verifyExactTextOnHomeListItemAtPosition(
         itemPosition = 1,
         targetViewId = R.id.recently_played_stories_text_view,
-        stringToMatch = context.getString(R.string.recently_played_stories)
+        stringToMatch = context.getString(R.string.home_activity_recently_played_stories)
       )
     }
   }
@@ -1327,7 +1327,7 @@ class HomeActivityTest {
       verifyExactTextOnHomeListItemAtPosition(
         itemPosition = 2,
         targetViewId = R.id.all_topics_text_view,
-        stringToMatch = context.getString((R.string.select_a_topic_to_start))
+        stringToMatch = context.getString((R.string.home_activity_all_topics_text))
       )
     }
   }
@@ -1361,7 +1361,7 @@ class HomeActivityTest {
       verifyExactTextOnHomeListItemAtPosition(
         itemPosition = 2,
         targetViewId = R.id.all_topics_text_view,
-        stringToMatch = context.getString((R.string.select_a_topic_to_start))
+        stringToMatch = context.getString((R.string.home_activity_all_topics_text))
       )
     }
   }
diff --git a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt
index 91a5071439b..6be8ffbe160 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/home/RecentlyPlayedFragmentTest.kt
@@ -227,7 +227,7 @@ class RecentlyPlayedFragmentTest {
         internalProfileId = internalProfileId
       )
     )
-    onView(withContentDescription(R.string.navigate_up)).perform(click())
+    onView(withContentDescription(R.string.navigate_up_text)).perform(click())
     assertThat(activityTestRule.activity.isFinishing).isTrue()
   }
 
@@ -254,7 +254,7 @@ class RecentlyPlayedFragmentTest {
           withParent(withId(R.id.recently_played_toolbar))
         )
       ).check(
-        matches(withText(R.string.recently_played_activity))
+        matches(withText(R.string.recently_played_activity_title))
       )
     }
   }
@@ -282,7 +282,7 @@ class RecentlyPlayedFragmentTest {
           withParent(withId(R.id.recently_played_toolbar))
         )
       ).check(
-        matches(withText(R.string.recently_played_activity))
+        matches(withText(R.string.recently_played_activity_title))
       )
     }
   }
@@ -345,7 +345,7 @@ class RecentlyPlayedFragmentTest {
           targetViewId = R.id.section_title_text_view
         )
       ).check(
-        matches(withText(R.string.ongoing_story_last_week))
+        matches(withText(R.string.home_activity_ongoing_story_last_week))
       )
     }
   }
@@ -1028,7 +1028,7 @@ class RecentlyPlayedFragmentTest {
           targetViewId = R.id.section_title_text_view
         )
       ).check(
-        matches(withText(R.string.ongoing_story_last_month))
+        matches(withText(R.string.home_activity_ongoing_story_last_month))
       )
     }
   }
@@ -1086,7 +1086,7 @@ class RecentlyPlayedFragmentTest {
       onView(
         allOf(instanceOf(TextView::class.java), withParent(withId(R.id.recently_played_toolbar)))
       ).check(
-        matches(withText(R.string.recently_played_activity))
+        matches(withText(R.string.recently_played_activity_title))
       )
     }
   }
@@ -1112,7 +1112,7 @@ class RecentlyPlayedFragmentTest {
       onView(
         allOf(instanceOf(TextView::class.java), withParent(withId(R.id.recently_played_toolbar)))
       ).check(
-        matches(withText(R.string.recently_played_activity))
+        matches(withText(R.string.recently_played_activity_title))
       )
     }
   }
@@ -1180,7 +1180,7 @@ class RecentlyPlayedFragmentTest {
           targetViewId = R.id.section_title_text_view
         )
       ).check(
-        matches(withText(R.string.ongoing_story_last_week))
+        matches(withText(R.string.home_activity_ongoing_story_last_week))
       )
     }
   }
@@ -1320,7 +1320,7 @@ class RecentlyPlayedFragmentTest {
           targetViewId = R.id.section_title_text_view
         )
       ).check(
-        matches(withText(R.string.ongoing_story_last_month))
+        matches(withText(R.string.home_activity_ongoing_story_last_month))
       )
     }
   }
diff --git a/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentTest.kt
index 3e1ce04a34f..4eb3755e40b 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/mydownloads/MyDownloadsFragmentTest.kt
@@ -191,7 +191,7 @@ class MyDownloadsFragmentTest {
     launch(MyDownloadsActivity::class.java).use {
       onView(
         allOf(
-          withText(R.string.tab_updates),
+          withText(R.string.my_downloads_fragment_tab_updates_text),
           isDescendantOfA(withId(R.id.my_downloads_tabs_container))
         )
       ).perform(click())
diff --git a/app/src/sharedTest/java/org/oppia/android/app/notice/BetaNoticeDialogFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/notice/BetaNoticeDialogFragmentTest.kt
index 9ab0a7a8159..64f0084956c 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/notice/BetaNoticeDialogFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/notice/BetaNoticeDialogFragmentTest.kt
@@ -139,7 +139,7 @@ class BetaNoticeDialogFragmentTest {
     launchBetaNoticeDialogFragmentTestActivity {
       onDialogView(withId(R.id.beta_notice_dialog_message)).check(matches(isDisplayed()))
       onDialogView(withId(R.id.beta_notice_dialog_message))
-        .check(matches(withText(R.string.beta_notice_dialog_message)))
+        .check(matches(withText(R.string.beta_notice_dialog_message_text)))
       onDialogView(withId(R.id.beta_notice_dialog_message))
         .check(isCompletelyBelow(withText(R.string.beta_notice_dialog_title)))
     }
@@ -151,7 +151,7 @@ class BetaNoticeDialogFragmentTest {
       onDialogView(withId(R.id.beta_notice_dialog_preference_checkbox))
         .check(matches(isDisplayed()))
       onDialogView(withId(R.id.beta_notice_dialog_preference_checkbox))
-        .check(matches(withText(R.string.beta_notice_dialog_do_not_show_again_text)))
+        .check(matches(withText(R.string.beta_notice_dialog_preference_checkbox_text)))
       onDialogView(withId(R.id.beta_notice_dialog_preference_checkbox))
         .check(isCompletelyBelow(withId(R.id.beta_notice_dialog_message)))
     }
diff --git a/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingFragmentTest.kt
index 53de66687fb..cd5557654bd 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingFragmentTest.kt
@@ -183,7 +183,7 @@ class OnboardingFragmentTest {
           withId(R.id.slide_description_text_view),
           isCompletelyDisplayed()
         )
-      ).check(matches(withText(R.string.onboarding_slide_0_description)))
+      ).check(matches(withText(R.string.onboarding_activity_slide_0_description)))
     }
   }
 
@@ -254,7 +254,7 @@ class OnboardingFragmentTest {
           withId(R.id.slide_title_text_view),
           isCompletelyDisplayed()
         )
-      ).check(matches(withText(R.string.onboarding_slide_1_title)))
+      ).check(matches(withText(R.string.onboarding_activity_slide_1_title)))
     }
   }
 
@@ -268,7 +268,7 @@ class OnboardingFragmentTest {
           withId(R.id.slide_description_text_view),
           isCompletelyDisplayed()
         )
-      ).check(matches(withText(R.string.onboarding_slide_1_description)))
+      ).check(matches(withText(R.string.onboarding_activity_slide_1_description)))
     }
   }
 
@@ -325,7 +325,7 @@ class OnboardingFragmentTest {
           withId(R.id.slide_title_text_view),
           isCompletelyDisplayed()
         )
-      ).check(matches(withText(R.string.onboarding_slide_3_title)))
+      ).check(matches(withText(R.string.onboarding_activity_slide_3_title)))
     }
   }
 
@@ -362,7 +362,7 @@ class OnboardingFragmentTest {
           withId(R.id.slide_title_text_view),
           isCompletelyDisplayed()
         )
-      ).check(matches(withText(R.string.onboarding_slide_2_title)))
+      ).check(matches(withText(R.string.onboarding_activity_slide_2_title)))
     }
   }
 
@@ -376,7 +376,7 @@ class OnboardingFragmentTest {
           withId(R.id.slide_description_text_view),
           isCompletelyDisplayed()
         )
-      ).check(matches(withText(R.string.onboarding_slide_2_description)))
+      ).check(matches(withText(R.string.onboarding_activity_slide_2_description)))
     }
   }
 
@@ -433,7 +433,7 @@ class OnboardingFragmentTest {
           withId(R.id.slide_title_text_view),
           isCompletelyDisplayed()
         )
-      ).check(matches(withText(R.string.onboarding_slide_3_title)))
+      ).check(matches(withText(R.string.onboarding_activity_slide_3_title)))
     }
   }
 
@@ -455,7 +455,7 @@ class OnboardingFragmentTest {
           withId(R.id.slide_title_text_view),
           isCompletelyDisplayed()
         )
-      ).check(matches(withText(R.string.onboarding_slide_3_title)))
+      ).check(matches(withText(R.string.onboarding_activity_slide_3_title)))
     }
   }
 
@@ -469,7 +469,7 @@ class OnboardingFragmentTest {
           withId(R.id.slide_description_text_view),
           isCompletelyDisplayed()
         )
-      ).check(matches(withText(R.string.onboarding_slide_3_description)))
+      ).check(matches(withText(R.string.onboarding_activity_slide_3_description)))
     }
   }
 
@@ -514,7 +514,7 @@ class OnboardingFragmentTest {
           withId(R.id.slide_title_text_view),
           isCompletelyDisplayed()
         )
-      ).check(matches(withText(R.string.onboarding_slide_3_title)))
+      ).check(matches(withText(R.string.onboarding_activity_slide_3_title)))
     }
   }
 
@@ -542,7 +542,7 @@ class OnboardingFragmentTest {
           withId(R.id.slide_title_text_view),
           isCompletelyDisplayed()
         )
-      ).check(matches(withText(R.string.onboarding_slide_1_title)))
+      ).check(matches(withText(R.string.onboarding_activity_slide_1_title)))
     }
   }
 
@@ -558,7 +558,7 @@ class OnboardingFragmentTest {
           withId(R.id.slide_title_text_view),
           isCompletelyDisplayed()
         )
-      ).check(matches(withText(R.string.onboarding_slide_3_title)))
+      ).check(matches(withText(R.string.onboarding_activity_slide_3_title)))
     }
   }
 
@@ -568,7 +568,7 @@ class OnboardingFragmentTest {
       onView(withId(R.id.onboarding_fragment_next_image_view)).check(
         matches(
           withContentDescription(
-            R.string.next_arrow
+            R.string.onboarding_activity_next_arrow_text
           )
         )
       )
@@ -582,7 +582,7 @@ class OnboardingFragmentTest {
       onView(withId(R.id.onboarding_fragment_next_image_view)).check(
         matches(
           withContentDescription(
-            R.string.next_arrow
+            R.string.onboarding_activity_next_arrow_text
           )
         )
       )
@@ -597,7 +597,7 @@ class OnboardingFragmentTest {
       onView(withId(R.id.slide_dots_container)).check(
         matches(
           withContentDescription(
-            context.getString(R.string.onboarding_slide_dots_content_description, 2, 4)
+            context.getString(R.string.onboarding_activity_slide_dots_content_description, 2, 4)
           )
         )
       )
@@ -613,7 +613,7 @@ class OnboardingFragmentTest {
       onView(withId(R.id.slide_dots_container)).check(
         matches(
           withContentDescription(
-            context.getString(R.string.onboarding_slide_dots_content_description, 2, 4)
+            context.getString(R.string.onboarding_activity_slide_dots_content_description, 2, 4)
           )
         )
       )
@@ -628,7 +628,7 @@ class OnboardingFragmentTest {
       onView(withId(R.id.slide_dots_container)).check(
         matches(
           withContentDescription(
-            context.getString(R.string.onboarding_slide_dots_content_description, 3, 4)
+            context.getString(R.string.onboarding_activity_slide_dots_content_description, 3, 4)
           )
         )
       )
@@ -644,7 +644,7 @@ class OnboardingFragmentTest {
       onView(withId(R.id.slide_dots_container)).check(
         matches(
           withContentDescription(
-            context.getString(R.string.onboarding_slide_dots_content_description, 3, 4)
+            context.getString(R.string.onboarding_activity_slide_dots_content_description, 3, 4)
           )
         )
       )
@@ -674,7 +674,7 @@ class OnboardingFragmentTest {
   private fun getAppName(): String = getResources().getString(R.string.app_name)
 
   private fun getOnboardingSlide0Title(): String =
-    getResources().getString(R.string.onboarding_slide_0_title, getAppName())
+    getResources().getString(R.string.onboarding_activity_slide_0_title, getAppName())
 
   private fun scrollToPosition(position: Int): ViewAction {
     return object : ViewAction {
diff --git a/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt
index 3210327edae..7239760d208 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt
@@ -607,7 +607,7 @@ class OptionsFragmentTest {
   }
 
   private fun ActivityScenario<OptionsActivity>.openNavigationDrawer() {
-    onView(withContentDescription(R.string.drawer_open_content_description))
+    onView(withContentDescription(R.string.navigation_drawer_fragment_open_content_description))
       .check(matches(isCompletelyDisplayed()))
       .perform(click())
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest.kt
index bf224018f5e..d21d71525d2 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/audio/AudioFragmentTest.kt
@@ -191,7 +191,7 @@ class AudioFragmentTest {
         .check(
           matches(
             withContentDescription(
-              context.getString(R.string.audio_player_seekbar_content_description)
+              context.getString(R.string.audio_fragment_progress_seek_bar_content_description)
             )
           )
         )
@@ -211,7 +211,7 @@ class AudioFragmentTest {
         .check(
           matches(
             withContentDescription(
-              context.getString(R.string.audio_language_icon_content_description)
+              context.getString(R.string.audio_fragment_language_icon_content_description)
             )
           )
         )
@@ -230,7 +230,15 @@ class AudioFragmentTest {
       onView(withId(R.id.play_pause_audio_icon))
         .check(matches(isDisplayed()))
       onView(withId(R.id.play_pause_audio_icon))
-        .check(matches(withContentDescription(context.getString(R.string.audio_play_description))))
+        .check(
+          matches(
+            withContentDescription(
+              context.getString(
+                R.string.audio_fragment_play_description
+              )
+            )
+          )
+        )
     }
   }
 
@@ -250,7 +258,13 @@ class AudioFragmentTest {
 
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.play_pause_audio_icon))
-        .check(matches(withContentDescription(context.getString(R.string.audio_pause_description))))
+        .check(
+          matches(
+            withContentDescription(
+              context.getString(R.string.audio_fragment_pause_description)
+            )
+          )
+        )
     }
   }
 
@@ -268,7 +282,13 @@ class AudioFragmentTest {
 
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.play_pause_audio_icon))
-        .check(matches(withContentDescription(context.getString(R.string.audio_play_description))))
+        .check(
+          matches(
+            withContentDescription(
+              context.getString(R.string.audio_fragment_play_description)
+            )
+          )
+        )
     }
   }
 
@@ -290,7 +310,13 @@ class AudioFragmentTest {
 
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.play_pause_audio_icon))
-        .check(matches(withContentDescription(context.getString(R.string.audio_pause_description))))
+        .check(
+          matches(
+            withContentDescription(
+              context.getString(R.string.audio_fragment_pause_description)
+            )
+          )
+        )
     }
   }
 
@@ -307,7 +333,13 @@ class AudioFragmentTest {
       onView(withId(R.id.audio_progress_seek_bar)).perform(setProgress(100))
       onView(isRoot()).perform(orientationLandscape())
       onView(withId(R.id.play_pause_audio_icon))
-        .check(matches(withContentDescription(context.getString(R.string.audio_pause_description))))
+        .check(
+          matches(
+            withContentDescription(
+              context.getString(R.string.audio_fragment_pause_description)
+            )
+          )
+        )
     }
   }
 
@@ -338,7 +370,15 @@ class AudioFragmentTest {
 
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.play_pause_audio_icon))
-        .check(matches(withContentDescription(context.getString(R.string.audio_play_description))))
+        .check(
+          matches(
+            withContentDescription(
+              context.getString(
+                R.string.audio_fragment_play_description
+              )
+            )
+          )
+        )
       onView(withId(R.id.audio_progress_seek_bar)).check(matches(withSeekBarPosition(0)))
     }
   }
diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/BottomSheetOptionsMenuTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/BottomSheetOptionsMenuTest.kt
index 12668ac7d76..f1a974c5209 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/BottomSheetOptionsMenuTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/BottomSheetOptionsMenuTest.kt
@@ -124,7 +124,7 @@ class BottomSheetOptionsMenuTest {
   fun bottomSheetOptionsMenu_selectHelp_callsClickListenerWithActionHelp() {
     launchBottomSheetOptionsMenuTestActivity {
       testCoroutineDispatchers.runCurrent()
-      onView(withText(R.string.menu_help)).inRoot(isDialog()).perform(click())
+      onView(withText(R.string.menu_help_text)).inRoot(isDialog()).perform(click())
       testCoroutineDispatchers.runCurrent()
       verify(mockBottomSheetOptionsMenuItemClickListener)
         .handleOnOptionsItemSelected(R.id.action_help)
@@ -135,7 +135,7 @@ class BottomSheetOptionsMenuTest {
   fun bottomSheetOptionsMenu_selectOptions_callsClickListenerWithActionOptions() {
     launchBottomSheetOptionsMenuTestActivity {
       testCoroutineDispatchers.runCurrent()
-      onView(withText(R.string.menu_options)).inRoot(isDialog()).perform(click())
+      onView(withText(R.string.menu_options_text)).inRoot(isDialog()).perform(click())
       testCoroutineDispatchers.runCurrent()
       verify(mockBottomSheetOptionsMenuItemClickListener)
         .handleOnOptionsItemSelected(R.id.action_options)
@@ -146,7 +146,11 @@ class BottomSheetOptionsMenuTest {
   fun bottomSheetOptionsMenu_selectClose_closesBottomSheet() {
     launchBottomSheetOptionsMenuTestActivity {
       testCoroutineDispatchers.runCurrent()
-      onView(withText(R.string.bottom_sheet_options_menu_close)).inRoot(isDialog()).perform(click())
+      onView(
+        withText(
+          R.string.exploration_activity_options_menu_close_text
+        )
+      ).inRoot(isDialog()).perform(click())
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.options_menu_bottom_sheet_container)).check(doesNotExist())
     }
diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
index e1cce42d8f3..2823e8926fb 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/exploration/ExplorationActivityTest.kt
@@ -463,7 +463,15 @@ class ExplorationActivityTest {
       networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.LOCAL)
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_audio_player))
-        .check(matches(withContentDescription(context.getString(R.string.audio_player_off))))
+        .check(
+          matches(
+            withContentDescription(
+              context.getString(
+                R.string.exploration_activity_audio_player_off_text
+              )
+            )
+          )
+        )
     }
     explorationDataController.stopPlayingExploration(isCompletion = false)
   }
@@ -492,7 +500,7 @@ class ExplorationActivityTest {
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_audio_player)).perform(click())
       testCoroutineDispatchers.runCurrent()
-      onView(withText(R.string.voiceover_language_icon_spotlight_hint))
+      onView(withText(R.string.audio_fragment_voiceover_language_icon_spotlight_hint))
         .check(matches(isDisplayed()))
     }
   }
@@ -543,7 +551,9 @@ class ExplorationActivityTest {
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_audio_player)).perform(click())
       testCoroutineDispatchers.runCurrent()
-      onView(withText(R.string.voiceover_language_icon_spotlight_hint)).check(doesNotExist())
+      onView(withText(R.string.audio_fragment_voiceover_language_icon_spotlight_hint)).check(
+        doesNotExist()
+      )
     }
   }
 
@@ -567,7 +577,7 @@ class ExplorationActivityTest {
       )
       testCoroutineDispatchers.runCurrent()
 
-      onView(withText(R.string.exploration_exit_button_spotlight_hint))
+      onView(withText(R.string.exploration_activity_exit_button_spotlight_hint))
         .check(matches(isDisplayed()))
     }
   }
@@ -612,7 +622,7 @@ class ExplorationActivityTest {
       )
       testCoroutineDispatchers.runCurrent()
 
-      onView(withText(R.string.exploration_exit_button_spotlight_hint))
+      onView(withText(R.string.exploration_activity_exit_button_spotlight_hint))
         .check(doesNotExist())
     }
   }
@@ -739,7 +749,15 @@ class ExplorationActivityTest {
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_audio_player)).perform(click())
       onView(withId(R.id.action_audio_player))
-        .check(matches(withContentDescription(context.getString(R.string.audio_player_on))))
+        .check(
+          matches(
+            withContentDescription(
+              context.getString(
+                R.string.exploration_activity_audio_player_on_text
+              )
+            )
+          )
+        )
     }
     explorationDataController.stopPlayingExploration(isCompletion = false)
   }
@@ -767,7 +785,13 @@ class ExplorationActivityTest {
       onView(withId(R.id.action_audio_player)).perform(click())
       onView(withId(R.id.action_audio_player)).perform(click())
       onView(withId(R.id.action_audio_player))
-        .check(matches(withContentDescription(context.getString(R.string.audio_player_off))))
+        .check(
+          matches(
+            withContentDescription(
+              context.getString(R.string.exploration_activity_audio_player_off_text)
+            )
+          )
+        )
     }
     explorationDataController.stopPlayingExploration(isCompletion = false)
   }
@@ -839,7 +863,7 @@ class ExplorationActivityTest {
       networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.NONE)
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_audio_player)).perform(click())
-      onView(withText(context.getString(R.string.audio_dialog_offline_message)))
+      onView(withText(context.getString(R.string.audio_fragment_offline_dialog_message)))
         .inRoot(isDialog())
         .check(matches(isDisplayed()))
     }
@@ -868,7 +892,7 @@ class ExplorationActivityTest {
       networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.CELLULAR)
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_audio_player)).perform(click())
-      onView(withText(context.getString(R.string.cellular_data_alert_dialog_title)))
+      onView(withText(context.getString(R.string.cellular_audio_dialog_title)))
         .inRoot(isDialog())
         .check(matches(isDisplayed()))
     }
@@ -898,7 +922,7 @@ class ExplorationActivityTest {
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_audio_player)).perform(click())
       onView(isRoot()).perform(orientationLandscape())
-      onView(withText(context.getString(R.string.cellular_data_alert_dialog_title)))
+      onView(withText(context.getString(R.string.cellular_audio_dialog_title)))
         .inRoot(isDialog())
         .check(matches(isDisplayed()))
     }
@@ -929,13 +953,13 @@ class ExplorationActivityTest {
       onView(withId(R.id.action_audio_player)).perform(click())
       onView(
         allOf(
-          withText(context.getString(R.string.cellular_data_alert_dialog_title)),
+          withText(context.getString(R.string.cellular_audio_dialog_title)),
           withEffectiveVisibility(Visibility.VISIBLE)
         )
       )
       onView(
         allOf(
-          withText(context.getString(R.string.audio_language_select_dialog_cancel_button)),
+          withText(context.getString(R.string.audio_language_dialog_cancel_button_text)),
           withEffectiveVisibility(Visibility.VISIBLE)
         )
       ).inRoot(isDialog()).perform(click())
@@ -968,14 +992,14 @@ class ExplorationActivityTest {
       onView(withId(R.id.action_audio_player)).perform(click())
       onView(
         allOf(
-          withText(context.getString(R.string.cellular_data_alert_dialog_title)),
+          withText(context.getString(R.string.cellular_audio_dialog_title)),
           withEffectiveVisibility(Visibility.VISIBLE)
         )
       )
 
       onView(
         allOf(
-          withText(context.getString(R.string.cellular_data_alert_dialog_okay_button)),
+          withText(context.getString(R.string.cellular_audio_dialog_okay_button_text)),
           withEffectiveVisibility(Visibility.VISIBLE)
         )
       ).inRoot(isDialog()).perform(click())
@@ -1012,13 +1036,13 @@ class ExplorationActivityTest {
       networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.CELLULAR)
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_audio_player)).perform(click())
-      onView(withText(context.getString(R.string.cellular_data_alert_dialog_title)))
+      onView(withText(context.getString(R.string.cellular_audio_dialog_title)))
         .inRoot(isDialog())
         .check(matches(isDisplayed()))
       onView(withId(R.id.cellular_data_dialog_checkbox))
         .inRoot(isDialog())
         .perform(click())
-      onView(withText(context.getString(R.string.audio_language_select_dialog_cancel_button)))
+      onView(withText(context.getString(R.string.audio_language_dialog_cancel_button_text)))
         .inRoot(isDialog())
         .perform(click())
 
@@ -1027,7 +1051,7 @@ class ExplorationActivityTest {
 
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.play_pause_audio_icon)).check(matches(not(isDisplayed())))
-      onView(withText(context.getString(R.string.cellular_data_alert_dialog_title)))
+      onView(withText(context.getString(R.string.cellular_audio_dialog_title)))
         .check(doesNotExist())
     }
     explorationDataController.stopPlayingExploration(isCompletion = false)
@@ -1055,13 +1079,13 @@ class ExplorationActivityTest {
       networkConnectionUtil.setCurrentConnectionStatus(ProdConnectionStatus.CELLULAR)
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_audio_player)).perform(click())
-      onView(withText(context.getString(R.string.cellular_data_alert_dialog_title)))
+      onView(withText(context.getString(R.string.cellular_audio_dialog_title)))
         .inRoot(isDialog())
         .check(matches(isDisplayed()))
       onView(withId(R.id.cellular_data_dialog_checkbox))
         .inRoot(isDialog())
         .perform(click())
-      onView(withText(context.getString(R.string.cellular_data_alert_dialog_okay_button)))
+      onView(withText(context.getString(R.string.cellular_audio_dialog_okay_button_text)))
         .inRoot(isDialog())
         .perform(click())
 
@@ -1071,7 +1095,7 @@ class ExplorationActivityTest {
 
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.audio_bar_container)).check(matches(isDisplayed()))
-      onView(withText(context.getString(R.string.cellular_data_alert_dialog_title)))
+      onView(withText(context.getString(R.string.cellular_audio_dialog_title)))
         .check(doesNotExist())
     }
     explorationDataController.stopPlayingExploration(isCompletion = false)
@@ -1156,7 +1180,7 @@ class ExplorationActivityTest {
         .inRoot(isDialog())
         .perform(click())
 
-      onView(withText(context.getString(R.string.audio_language_select_dialog_okay_button)))
+      onView(withText(context.getString(R.string.audio_language_dialog_okay_button_text)))
         .inRoot(isDialog())
         .perform(click())
 
@@ -1216,7 +1240,13 @@ class ExplorationActivityTest {
       Thread.sleep(1000)
 
       onView(withId(R.id.play_pause_audio_icon))
-        .check(matches(withContentDescription(context.getString(R.string.audio_pause_description))))
+        .check(
+          matches(
+            withContentDescription(
+              context.getString(R.string.audio_fragment_pause_description)
+            )
+          )
+        )
     }
     explorationDataController.stopPlayingExploration(isCompletion = false)
   }
@@ -1353,7 +1383,7 @@ class ExplorationActivityTest {
     )
     testCoroutineDispatchers.runCurrent()
     pressBack()
-    onView(withText(R.string.unsaved_exploration_dialog_cancel_button)).inRoot(isDialog())
+    onView(withText(R.string.unsaved_exploration_dialog_cancel_button_text)).inRoot(isDialog())
       .perform(click())
     assertThat(explorationActivityTestRule.activity.isFinishing).isFalse()
     explorationDataController.stopPlayingExploration(isCompletion = false)
@@ -1382,7 +1412,7 @@ class ExplorationActivityTest {
     testCoroutineDispatchers.runCurrent()
 
     pressBack()
-    onView(withText(R.string.stop_exploration_dialog_leave_button)).inRoot(isDialog())
+    onView(withText(R.string.stop_exploration_dialog_leave_button_text)).inRoot(isDialog())
       .perform(click())
     assertThat(explorationActivityTestRule.activity.isFinishing).isTrue()
   }
@@ -1413,7 +1443,7 @@ class ExplorationActivityTest {
     testCoroutineDispatchers.runCurrent()
 
     pressBack()
-    onView(withText(R.string.stop_exploration_dialog_cancel_button)).inRoot(isDialog())
+    onView(withText(R.string.stop_exploration_dialog_cancel_button_text)).inRoot(isDialog())
       .perform(click())
 
     explorationCheckpointTestHelper.verifyExplorationProgressIsSaved(
@@ -1453,7 +1483,7 @@ class ExplorationActivityTest {
     testCoroutineDispatchers.runCurrent()
 
     pressBack()
-    onView(withText(R.string.stop_exploration_dialog_leave_button)).inRoot(isDialog())
+    onView(withText(R.string.stop_exploration_dialog_leave_button_text)).inRoot(isDialog())
       .perform(click())
 
     explorationCheckpointTestHelper.verifyExplorationProgressIsSaved(
@@ -1511,7 +1541,7 @@ class ExplorationActivityTest {
     testCoroutineDispatchers.runCurrent()
 
     onView(withContentDescription(R.string.nav_app_bar_navigate_up_description)).perform(click())
-    onView(withText(R.string.progress_database_full_dialog_title)).inRoot(isDialog())
+    onView(withText(R.string.stop_exploration_dialog_progress_full_title)).inRoot(isDialog())
       .check(matches(isDisplayed()))
 
     assertThat(explorationActivityTestRule.activity.isFinishing).isTrue()
@@ -1584,7 +1614,7 @@ class ExplorationActivityTest {
       testCoroutineDispatchers.runCurrent()
 
       pressBack()
-      onView(withText(R.string.progress_database_full_dialog_title)).inRoot(isDialog())
+      onView(withText(R.string.stop_exploration_dialog_progress_full_title)).inRoot(isDialog())
         .check(matches(isDisplayed()))
     }
     explorationDataController.stopPlayingExploration(isCompletion = false)
@@ -1620,7 +1650,7 @@ class ExplorationActivityTest {
       testCoroutineDispatchers.runCurrent()
 
       onView(withContentDescription(R.string.nav_app_bar_navigate_up_description)).perform(click())
-      onView(withText(R.string.progress_database_full_dialog_title)).inRoot(isDialog())
+      onView(withText(R.string.stop_exploration_dialog_progress_full_title)).inRoot(isDialog())
         .check(matches(isDisplayed()))
     }
     explorationDataController.stopPlayingExploration(isCompletion = false)
@@ -1657,9 +1687,9 @@ class ExplorationActivityTest {
       testCoroutineDispatchers.runCurrent()
 
       onView(withContentDescription(R.string.nav_app_bar_navigate_up_description)).perform(click())
-      onView(withText(R.string.progress_database_full_dialog_title)).inRoot(isDialog())
+      onView(withText(R.string.stop_exploration_dialog_progress_full_title)).inRoot(isDialog())
         .check(matches(isDisplayed()))
-      onView(withText(R.string.progress_database_full_dialog_back_to_lesson_button))
+      onView(withText(R.string.stop_exploration_dialog_progress_full_back_to_lesson_button))
         .inRoot(isDialog()).perform(click())
     }
     explorationDataController.stopPlayingExploration(isCompletion = false)
@@ -1697,7 +1727,7 @@ class ExplorationActivityTest {
 
       pressBack()
 
-      onView(withText(R.string.progress_database_full_dialog_continue_button))
+      onView(withText(R.string.stop_exploration_dialog_progress_full_continue_button))
         .inRoot(isDialog()).perform(click())
 
       assertThat(explorationActivityTestRule.activity.isFinishing).isTrue()
@@ -1737,7 +1767,7 @@ class ExplorationActivityTest {
 
       pressBack()
 
-      onView(withText(R.string.progress_database_full_dialog_leave_without_saving_progress_button))
+      onView(withText(R.string.stop_exploration_dialog_progress_full_without_saving_button))
         .inRoot(isDialog()).perform(click())
 
       assertThat(explorationActivityTestRule.activity.isFinishing).isTrue()
@@ -1776,7 +1806,7 @@ class ExplorationActivityTest {
 
       pressBack()
 
-      onView(withText(R.string.progress_database_full_dialog_leave_without_saving_progress_button))
+      onView(withText(R.string.stop_exploration_dialog_progress_full_without_saving_button))
         .inRoot(isDialog()).perform(click())
 
       testCoroutineDispatchers.runCurrent()
@@ -1827,7 +1857,7 @@ class ExplorationActivityTest {
 
       pressBack()
 
-      onView(withText(R.string.progress_database_full_dialog_continue_button))
+      onView(withText(R.string.stop_exploration_dialog_progress_full_continue_button))
         .inRoot(isDialog()).perform(click())
 
       testCoroutineDispatchers.runCurrent()
@@ -1878,7 +1908,7 @@ class ExplorationActivityTest {
 
       pressBack()
 
-      onView(withText(R.string.progress_database_full_dialog_back_to_lesson_button))
+      onView(withText(R.string.stop_exploration_dialog_progress_full_back_to_lesson_button))
         .inRoot(isDialog()).perform(click())
 
       explorationCheckpointTestHelper.verifyExplorationProgressIsSaved(
@@ -2202,7 +2232,8 @@ class ExplorationActivityTest {
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_bottom_sheet_options_menu)).perform(click())
       testCoroutineDispatchers.runCurrent()
-      onView(withText(context.getString(R.string.menu_help))).inRoot(isDialog()).perform(click())
+      onView(withText(context.getString(R.string.menu_help_text))).inRoot(isDialog())
+        .perform(click())
       testCoroutineDispatchers.runCurrent()
       intended(hasComponent(HelpActivity::class.java.name))
       intended(
@@ -2236,7 +2267,8 @@ class ExplorationActivityTest {
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_bottom_sheet_options_menu)).perform(click())
       testCoroutineDispatchers.runCurrent()
-      onView(withText(context.getString(R.string.menu_options))).inRoot(isDialog()).perform(click())
+      onView(withText(context.getString(R.string.menu_options_text))).inRoot(isDialog())
+        .perform(click())
       testCoroutineDispatchers.runCurrent()
       intended(hasComponent(OptionsActivity::class.java.name))
       intended(
@@ -2270,7 +2302,7 @@ class ExplorationActivityTest {
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.action_bottom_sheet_options_menu)).perform(click())
       testCoroutineDispatchers.runCurrent()
-      onView(withText(context.getString(R.string.bottom_sheet_options_menu_close)))
+      onView(withText(context.getString(R.string.exploration_activity_options_menu_close_text)))
         .inRoot(isDialog())
         .perform(click())
       testCoroutineDispatchers.runCurrent()
diff --git a/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt
index 24ac673be8d..eb1e17154cc 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/player/state/StateFragmentTest.kt
@@ -201,20 +201,33 @@ import javax.inject.Singleton
 // SameParameterValue: tests should have specific context included/excluded for readability.
 @Suppress("FunctionName", "SameParameterValue")
 class StateFragmentTest {
-  @get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
-  @get:Rule val oppiaTestRule = OppiaTestRule()
-
-  @Inject lateinit var profileTestHelper: ProfileTestHelper
-  @Inject lateinit var context: Context
-  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
-  @Inject lateinit var editTextInputAction: EditTextInputAction
-  @field:[Inject BackgroundDispatcher] lateinit var backgroundDispatcher: CoroutineDispatcher
-  @Inject lateinit var explorationCheckpointTestHelper: ExplorationCheckpointTestHelper
-  @Inject lateinit var translationController: TranslationController
-  @Inject lateinit var monitorFactory: DataProviderTestMonitor.Factory
-  @Inject lateinit var testGlideImageLoader: TestGlideImageLoader
-  @Inject lateinit var profileManagementController: ProfileManagementController
-  @Inject lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
+  @get:Rule
+  val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+  @get:Rule
+  val oppiaTestRule = OppiaTestRule()
+
+  @Inject
+  lateinit var profileTestHelper: ProfileTestHelper
+  @Inject
+  lateinit var context: Context
+  @Inject
+  lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+  @Inject
+  lateinit var editTextInputAction: EditTextInputAction
+  @field:[Inject BackgroundDispatcher]
+  lateinit var backgroundDispatcher: CoroutineDispatcher
+  @Inject
+  lateinit var explorationCheckpointTestHelper: ExplorationCheckpointTestHelper
+  @Inject
+  lateinit var translationController: TranslationController
+  @Inject
+  lateinit var monitorFactory: DataProviderTestMonitor.Factory
+  @Inject
+  lateinit var testGlideImageLoader: TestGlideImageLoader
+  @Inject
+  lateinit var profileManagementController: ProfileManagementController
+  @Inject
+  lateinit var fakeAnalyticsEventLogger: FakeAnalyticsEventLogger
 
   private val profileId = ProfileId.newBuilder().apply { internalId = 1 }.build()
 
@@ -308,7 +321,7 @@ class StateFragmentTest {
 
       verifySubmitAnswerButtonIsDisabled()
       onView(withId(R.id.submit_answer_button)).check(
-        matches(withText(R.string.state_submit_button))
+        matches(withText(R.string.state_fragment_submit_button_text))
       )
     }
   }
@@ -324,7 +337,7 @@ class StateFragmentTest {
 
       scrollToViewType(SUBMIT_ANSWER_BUTTON)
       onView(withId(R.id.submit_answer_button)).check(
-        matches(withText(R.string.state_submit_button))
+        matches(withText(R.string.state_fragment_submit_button_text))
       )
     }
   }
@@ -355,7 +368,7 @@ class StateFragmentTest {
 
       scrollToViewType(CONTINUE_NAVIGATION_BUTTON)
       onView(withId(R.id.continue_navigation_button)).check(
-        matches(withText(R.string.state_continue_button))
+        matches(withText(R.string.state_fragment_continue_button_text))
       )
     }
   }
@@ -388,7 +401,7 @@ class StateFragmentTest {
 
       scrollToViewType(CONTINUE_NAVIGATION_BUTTON)
       onView(withId(R.id.continue_navigation_button)).check(
-        matches(withText(R.string.state_continue_button))
+        matches(withText(R.string.state_fragment_continue_button_text))
       )
     }
   }
@@ -566,7 +579,7 @@ class StateFragmentTest {
 
       scrollToViewType(SUBMIT_ANSWER_BUTTON)
       onView(withId(R.id.submit_answer_button)).check(
-        matches(withText(R.string.state_submit_button))
+        matches(withText(R.string.state_fragment_submit_button_text))
       )
       onView(withId(R.id.submit_answer_button)).check(matches(not(isEnabled())))
     }
@@ -584,7 +597,7 @@ class StateFragmentTest {
 
       scrollToViewType(SUBMIT_ANSWER_BUTTON)
       onView(withId(R.id.submit_answer_button)).check(
-        matches(withText(R.string.state_submit_button))
+        matches(withText(R.string.state_fragment_submit_button_text))
       )
       onView(withId(R.id.submit_answer_button)).check(matches(not(isEnabled())))
     }
@@ -618,7 +631,7 @@ class StateFragmentTest {
 
       scrollToViewType(CONTINUE_NAVIGATION_BUTTON)
       onView(withId(R.id.continue_navigation_button)).check(
-        matches(withText(R.string.state_continue_button))
+        matches(withText(R.string.state_fragment_continue_button_text))
       )
     }
   }
@@ -653,7 +666,7 @@ class StateFragmentTest {
 
       scrollToViewType(CONTINUE_NAVIGATION_BUTTON)
       onView(withId(R.id.continue_navigation_button)).check(
-        matches(withText(R.string.state_continue_button))
+        matches(withText(R.string.state_fragment_continue_button_text))
       )
     }
   }
@@ -777,7 +790,7 @@ class StateFragmentTest {
       onView(withId(R.id.submitted_answer_recycler_view_container)).check(
         matches(
           withContentDescription(
-            context.getString(R.string.incorrect_submitted_answer)
+            context.getString(R.string.state_fragment_incorrect_submitted_answer)
           )
         )
       )
@@ -807,7 +820,7 @@ class StateFragmentTest {
       onView(withId(R.id.submitted_answer_recycler_view_container)).check(
         matches(
           withContentDescription(
-            context.getString(R.string.correct_submitted_answer)
+            context.getString(R.string.state_fragment_correct_submitted_answer)
           )
         )
       )
@@ -1144,7 +1157,7 @@ class StateFragmentTest {
       // Ninth state: end exploration.
       scrollToViewType(RETURN_TO_TOPIC_NAVIGATION_BUTTON)
       onView(withId(R.id.return_to_topic_button)).check(
-        matches(withText(R.string.state_end_exploration_button))
+        matches(withText(R.string.state_fragment_return_to_topic_button_text))
       )
     }
   }
@@ -1162,7 +1175,7 @@ class StateFragmentTest {
       // Ninth state: end exploration.
       scrollToViewType(RETURN_TO_TOPIC_NAVIGATION_BUTTON)
       onView(withId(R.id.return_to_topic_button)).check(
-        matches(withText(R.string.state_end_exploration_button))
+        matches(withText(R.string.state_fragment_return_to_topic_button_text))
       )
     }
   }
@@ -1529,7 +1542,11 @@ class StateFragmentTest {
 
       // Verify that the user is now on the sixth state.
       verifyViewTypeIsPresent(NUMERIC_INPUT_INTERACTION)
-      verifyHint(context.resources.getString(R.string.numeric_input_hint))
+      verifyHint(
+        context.resources.getString(
+          R.string.state_fragment_numeric_input_interaction_hint
+        )
+      )
     }
   }
 
@@ -2502,7 +2519,7 @@ class StateFragmentTest {
       // Ninth state: end exploration.
       scrollToViewType(RETURN_TO_TOPIC_NAVIGATION_BUTTON)
       onView(withId(R.id.return_to_topic_button)).check(
-        matches(withText(R.string.state_end_exploration_button))
+        matches(withText(R.string.state_fragment_return_to_topic_button_text))
       )
     }
   }
@@ -3600,7 +3617,7 @@ class StateFragmentTest {
       // Verify that the user is now on the tenth state.
       scrollToViewType(RETURN_TO_TOPIC_NAVIGATION_BUTTON)
       onView(withId(R.id.return_to_topic_button)).check(
-        matches(withText(R.string.state_end_exploration_button))
+        matches(withText(R.string.state_fragment_return_to_topic_button_text))
       )
     }
   }
@@ -3620,7 +3637,7 @@ class StateFragmentTest {
       // in this interaction.
       scrollToViewType(RETURN_TO_TOPIC_NAVIGATION_BUTTON)
       onView(withId(R.id.return_to_topic_button)).check(
-        matches(withText(R.string.state_end_exploration_button))
+        matches(withText(R.string.state_fragment_return_to_topic_button_text))
       )
     }
   }
@@ -3640,7 +3657,7 @@ class StateFragmentTest {
       // interaction.
       scrollToViewType(RETURN_TO_TOPIC_NAVIGATION_BUTTON)
       onView(withId(R.id.return_to_topic_button)).check(
-        matches(withText(R.string.state_end_exploration_button))
+        matches(withText(R.string.state_fragment_return_to_topic_button_text))
       )
     }
   }
@@ -3660,7 +3677,7 @@ class StateFragmentTest {
       // different expressions will match if they evaluate to the same value).
       scrollToViewType(RETURN_TO_TOPIC_NAVIGATION_BUTTON)
       onView(withId(R.id.return_to_topic_button)).check(
-        matches(withText(R.string.state_end_exploration_button))
+        matches(withText(R.string.state_fragment_return_to_topic_button_text))
       )
     }
   }
@@ -3699,7 +3716,7 @@ class StateFragmentTest {
       // different expressions will match if they evaluate to the same value).
       scrollToViewType(RETURN_TO_TOPIC_NAVIGATION_BUTTON)
       onView(withId(R.id.return_to_topic_button)).check(
-        matches(withText(R.string.state_end_exploration_button))
+        matches(withText(R.string.state_fragment_return_to_topic_button_text))
       )
     }
   }
@@ -3719,7 +3736,7 @@ class StateFragmentTest {
       // the '='.
       scrollToViewType(RETURN_TO_TOPIC_NAVIGATION_BUTTON)
       onView(withId(R.id.return_to_topic_button)).check(
-        matches(withText(R.string.state_end_exploration_button))
+        matches(withText(R.string.state_fragment_return_to_topic_button_text))
       )
     }
   }
diff --git a/app/src/sharedTest/java/org/oppia/android/app/policies/PoliciesActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/policies/PoliciesActivityTest.kt
index a3c01568fb0..ad5b2a7a835 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/policies/PoliciesActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/policies/PoliciesActivityTest.kt
@@ -171,7 +171,11 @@ class PoliciesActivityTest {
 
         // Verify that the activity label is correct as a proxy to verify TalkBack will announce the
         // correct string when it's read out.
-        assertThat(titleToolbar.title).isEqualTo(context.getString(R.string.privacy_policy_title))
+        assertThat(titleToolbar.title).isEqualTo(
+          context.getString(
+            R.string.policy_activity_privacy_policy_title
+          )
+        )
       }
     }
   }
@@ -222,7 +226,9 @@ class PoliciesActivityTest {
 
         // Verify that the activity label is correct as a proxy to verify TalkBack will announce the
         // correct string when it's read out.
-        assertThat(titleToolbar.title).isEqualTo(context.getString(R.string.terms_of_service_title))
+        assertThat(titleToolbar.title).isEqualTo(
+          context.getString(R.string.policy_activity_terms_of_service_title)
+        )
       }
     }
   }
diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt
index 605a1c18cc7..e106fa9987f 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt
@@ -183,7 +183,7 @@ class AddProfileActivityTest {
 
     // Verify that the activity label is correct as a proxy to verify TalkBack will announce the
     // correct string when it's read out.
-    assertThat(label).isEqualTo(context.getString(R.string.add_profile_activity_label))
+    assertThat(label).isEqualTo(context.getString(R.string.add_profile_activity_title))
   }
 
   @Test
@@ -193,7 +193,7 @@ class AddProfileActivityTest {
         .check(
           matches(
             hasHelperText(
-              context.resources.getString(R.string.add_profile_required)
+              context.resources.getString(R.string.add_profile_activity_user_name_helper_text)
             )
           )
         )
@@ -217,7 +217,7 @@ class AddProfileActivityTest {
         .check(
           matches(
             hasHelperText(
-              context.resources.getString(R.string.add_profile_required)
+              context.resources.getString(R.string.add_profile_activity_user_name_helper_text)
             )
           )
         )
@@ -259,7 +259,7 @@ class AddProfileActivityTest {
         .check(
           matches(
             hasHelperText(
-              context.resources.getString(R.string.add_profile_required)
+              context.resources.getString(R.string.add_profile_activity_user_name_helper_text)
             )
           )
         )
@@ -535,7 +535,7 @@ class AddProfileActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.add_profile_error_name_not_unique)
+              context.resources.getString(R.string.add_profile_activity_name_not_unique_error_text)
             )
           )
         )
@@ -563,7 +563,7 @@ class AddProfileActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.add_profile_error_name_not_unique)
+              context.resources.getString(R.string.add_profile_activity_name_not_unique_error_text)
             )
           )
         )
@@ -658,7 +658,9 @@ class AddProfileActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.add_profile_error_name_only_letters)
+              context.resources.getString(
+                R.string.add_profile_activity_name_only_letters_error_text
+              )
             )
           )
         )
@@ -687,7 +689,9 @@ class AddProfileActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.add_profile_error_name_only_letters)
+              context.resources.getString(
+                R.string.add_profile_activity_name_only_letters_error_text
+              )
             )
           )
         )
@@ -792,7 +796,7 @@ class AddProfileActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.add_profile_error_pin_length)
+              context.resources.getString(R.string.add_profile_activity_pin_length_error_text)
             )
           )
         )
@@ -838,7 +842,7 @@ class AddProfileActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.add_profile_error_pin_length)
+              context.resources.getString(R.string.add_profile_activity_pin_length_error_text)
             )
           )
         )
@@ -956,7 +960,9 @@ class AddProfileActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.add_profile_error_pin_confirm_wrong)
+              context.resources.getString(
+                R.string.add_profile_activity_wrong_confirm_pin_error_text
+              )
             )
           )
         )
@@ -1023,7 +1029,9 @@ class AddProfileActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.add_profile_error_pin_confirm_wrong)
+              context.resources.getString(
+                R.string.add_profile_activity_wrong_confirm_pin_error_text
+              )
             )
           )
         )
@@ -1571,7 +1579,7 @@ class AddProfileActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.add_profile_error_name_not_unique)
+              context.resources.getString(R.string.add_profile_activity_name_not_unique_error_text)
             )
           )
         )
@@ -1691,7 +1699,9 @@ class AddProfileActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.add_profile_error_pin_confirm_wrong)
+              context.resources.getString(
+                R.string.add_profile_activity_wrong_confirm_pin_error_text
+              )
             )
           )
         )
@@ -1742,7 +1752,15 @@ class AddProfileActivityTest {
   fun testAddProfileActivity_clickInfo_infoPopupIsDisplayed() {
     launch(AddProfileActivity::class.java).use {
       onView(withId(R.id.add_profile_activity_info_image_view)).perform(click())
-      onView(withText(context.getString(R.string.add_profile_pin_info))).inRoot(isDialog())
+      onView(
+        withText(
+          context.getString(
+            R.string.add_profile_activity_pin_info_dialog_text
+          )
+        )
+      ).inRoot(
+        isDialog()
+      )
         .check(
           matches(
             isDisplayed()
@@ -1756,7 +1774,15 @@ class AddProfileActivityTest {
     launch(AddProfileActivity::class.java).use {
       onView(withId(R.id.add_profile_activity_info_image_view)).perform(click())
       onView(isRoot()).perform(orientationLandscape())
-      onView(withText(context.getString(R.string.add_profile_pin_info))).inRoot(isDialog())
+      onView(
+        withText(
+          context.getString(
+            R.string.add_profile_activity_pin_info_dialog_text
+          )
+        )
+      ).inRoot(
+        isDialog()
+      )
         .check(
           matches(
             isDisplayed()
diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/AdminAuthActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/AdminAuthActivityTest.kt
index 87b7eaa2378..674879ceddd 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/profile/AdminAuthActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/profile/AdminAuthActivityTest.kt
@@ -180,7 +180,11 @@ class AdminAuthActivityTest {
         adminPinEnum = AdminAuthEnum.PROFILE_ADD_PROFILE.value
       )
     ).use {
-      onView(withContentDescription(R.string.admin_auth_close)).check(matches(isDisplayed()))
+      onView(
+        withContentDescription(
+          R.string.admin_auth_activity_tool_bar_content_desc
+        )
+      ).check(matches(isDisplayed()))
     }
   }
 
@@ -307,7 +311,7 @@ class AdminAuthActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.admin_auth_incorrect)
+              context.resources.getString(R.string.admin_auth_activity_incorrect_pin_label)
             )
           )
         )
@@ -338,7 +342,7 @@ class AdminAuthActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.admin_auth_incorrect)
+              context.resources.getString(R.string.admin_auth_activity_incorrect_pin_label)
             )
           )
         )
@@ -424,7 +428,7 @@ class AdminAuthActivityTest {
         matches(
           withText(
             context.resources.getString(
-              R.string.admin_auth_heading
+              R.string.admin_auth_activity_heading_text
             )
           )
         )
@@ -434,7 +438,7 @@ class AdminAuthActivityTest {
           matches(
             withText(
               context.resources.getString(
-                R.string.admin_auth_admin_controls_sub
+                R.string.admin_auth_activity_controls_subheading_text
               )
             )
           )
@@ -444,7 +448,7 @@ class AdminAuthActivityTest {
         .check(
           matches(
             withText(
-              context.resources.getString(R.string.admin_auth_admin_controls_sub)
+              context.resources.getString(R.string.admin_auth_activity_controls_subheading_text)
             )
           )
         )
@@ -452,7 +456,7 @@ class AdminAuthActivityTest {
         matches(
           withText(
             context.resources.getString(
-              R.string.admin_auth_heading
+              R.string.admin_auth_activity_heading_text
             )
           )
         )
@@ -475,7 +479,7 @@ class AdminAuthActivityTest {
         matches(
           withText(
             context.resources.getString(
-              R.string.admin_auth_heading
+              R.string.admin_auth_activity_heading_text
             )
           )
         )
@@ -485,7 +489,7 @@ class AdminAuthActivityTest {
           matches(
             withText(
               context.resources.getString(
-                R.string.admin_auth_sub
+                R.string.admin_auth_activity_subheading_text
               )
             )
           )
@@ -496,7 +500,7 @@ class AdminAuthActivityTest {
           matches(
             withText(
               context.resources.getString(
-                R.string.admin_auth_sub
+                R.string.admin_auth_activity_subheading_text
               )
             )
           )
@@ -505,7 +509,7 @@ class AdminAuthActivityTest {
         matches(
           withText(
             context.resources.getString(
-              R.string.admin_auth_heading
+              R.string.admin_auth_activity_heading_text
             )
           )
         )
@@ -572,7 +576,7 @@ class AdminAuthActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.admin_auth_incorrect)
+              context.resources.getString(R.string.admin_auth_activity_incorrect_pin_label)
             )
           )
         )
@@ -581,7 +585,7 @@ class AdminAuthActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.admin_auth_incorrect)
+              context.resources.getString(R.string.admin_auth_activity_incorrect_pin_label)
             )
           )
         )
@@ -612,7 +616,7 @@ class AdminAuthActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.admin_auth_incorrect)
+              context.resources.getString(R.string.admin_auth_activity_incorrect_pin_label)
             )
           )
         )
@@ -621,7 +625,7 @@ class AdminAuthActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.admin_auth_incorrect)
+              context.resources.getString(R.string.admin_auth_activity_incorrect_pin_label)
             )
           )
         )
diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/AdminPinActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/AdminPinActivityTest.kt
index 96b1025a35e..a6768a2cbbe 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/profile/AdminPinActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/profile/AdminPinActivityTest.kt
@@ -433,7 +433,7 @@ class AdminPinActivityTest {
           matches(
             hasErrorText(
               context.resources.getString(
-                R.string.admin_pin_error_pin_confirm_wrong
+                R.string.admin_pin_activity_wrong_pin_text
               )
             )
           )
@@ -474,7 +474,7 @@ class AdminPinActivityTest {
       onView(withId(R.id.admin_pin_input_confirm_pin)).check(
         matches(
           hasErrorText(
-            context.resources.getString(R.string.admin_pin_error_pin_confirm_wrong)
+            context.resources.getString(R.string.admin_pin_activity_wrong_pin_text)
           )
         )
       )
@@ -576,7 +576,11 @@ class AdminPinActivityTest {
         adminPinEnum = 1
       )
     ).use {
-      onView(withContentDescription(R.string.admin_auth_close)).check(matches(isDisplayed()))
+      onView(
+        withContentDescription(
+          R.string.admin_auth_activity_tool_bar_content_desc
+        )
+      ).check(matches(isDisplayed()))
     }
   }
 
@@ -826,7 +830,7 @@ class AdminPinActivityTest {
       onView(withId(R.id.admin_pin_input_confirm_pin)).check(
         matches(
           hasErrorText(
-            context.resources.getString(R.string.admin_pin_error_pin_confirm_wrong)
+            context.resources.getString(R.string.admin_pin_activity_wrong_pin_text)
           )
         )
       )
@@ -869,7 +873,7 @@ class AdminPinActivityTest {
       onView(withId(R.id.admin_pin_input_confirm_pin)).check(
         matches(
           hasErrorText(
-            context.resources.getString(R.string.admin_pin_error_pin_confirm_wrong)
+            context.resources.getString(R.string.admin_pin_activity_wrong_pin_text)
           )
         )
       )
@@ -1005,7 +1009,7 @@ class AdminPinActivityTest {
       onView(withId(R.id.admin_pin_input_confirm_pin)).check(
         matches(
           hasErrorText(
-            context.resources.getString(R.string.admin_pin_error_pin_confirm_wrong)
+            context.resources.getString(R.string.admin_pin_activity_wrong_pin_text)
           )
         )
       )
@@ -1046,7 +1050,7 @@ class AdminPinActivityTest {
       onView(withId(R.id.admin_pin_input_confirm_pin)).check(
         matches(
           hasErrorText(
-            context.resources.getString(R.string.admin_pin_error_pin_confirm_wrong)
+            context.resources.getString(R.string.admin_pin_activity_wrong_pin_text)
           )
         )
       )
diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt
index 16ce38b184e..48a2b49994f 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/profile/PinPasswordActivityTest.kt
@@ -261,7 +261,11 @@ class PinPasswordActivityTest {
         .perform(editTextInputAction.appendText("54321"), closeSoftKeyboard())
       onView(withId(R.id.pin_password_input_pin)).check(
         matches(
-          hasErrorText(context.resources.getString(R.string.pin_password_incorrect_pin))
+          hasErrorText(
+            context.resources.getString(
+              R.string.pin_password_activity_incorrect_pin_error
+            )
+          )
         )
       )
     }
@@ -298,7 +302,11 @@ class PinPasswordActivityTest {
       )
       onView(withId(R.id.pin_password_input_pin)).check(
         matches(
-          hasErrorText(context.resources.getString(R.string.pin_password_incorrect_pin))
+          hasErrorText(
+            context.resources.getString(
+              R.string.pin_password_activity_incorrect_pin_error
+            )
+          )
         )
       )
     }
@@ -320,7 +328,13 @@ class PinPasswordActivityTest {
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.pin_password_input_pin)).check(
         matches(
-          not(hasErrorText(context.resources.getString(R.string.pin_password_incorrect_pin)))
+          not(
+            hasErrorText(
+              context.resources.getString(
+                R.string.pin_password_activity_incorrect_pin_error
+              )
+            )
+          )
         )
       )
     }
@@ -366,14 +380,14 @@ class PinPasswordActivityTest {
       ).inRoot(isDialog())
         .perform(editTextInputAction.appendText("1234"), closeSoftKeyboard())
 
-      onView(withText(context.getString(R.string.admin_settings_submit)))
+      onView(withText(context.getString(R.string.admin_settings_dialog_submit_button_text)))
         .inRoot(isDialog())
         .perform(click())
       onView(withId(R.id.admin_settings_input_pin))
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.admin_settings_incorrect)
+              context.resources.getString(R.string.admin_settings_dialog_incorrect_pin_error_text)
             )
           )
         )
@@ -412,7 +426,7 @@ class PinPasswordActivityTest {
       ).inRoot(isDialog())
         .perform(editTextInputAction.appendText("12345"), closeSoftKeyboard())
 
-      onView(withText(context.getString(R.string.admin_settings_submit)))
+      onView(withText(context.getString(R.string.admin_settings_dialog_submit_button_text)))
         .inRoot(isDialog())
         .perform(click())
 
@@ -424,14 +438,14 @@ class PinPasswordActivityTest {
       ).inRoot(isDialog())
         .perform(editTextInputAction.appendText("32"), closeSoftKeyboard())
 
-      onView(withText(context.getString(R.string.admin_settings_submit)))
+      onView(withText(context.getString(R.string.admin_settings_dialog_submit_button_text)))
         .inRoot(isDialog())
         .perform(click())
       onView(withId(R.id.reset_pin_input_pin))
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.add_profile_error_pin_length)
+              context.resources.getString(R.string.add_profile_activity_pin_length_error_text)
             )
           )
         )
@@ -469,7 +483,7 @@ class PinPasswordActivityTest {
       ).inRoot(isDialog())
         .perform(editTextInputAction.appendText("12345"), closeSoftKeyboard())
 
-      onView(withText(context.getString(R.string.admin_settings_submit)))
+      onView(withText(context.getString(R.string.admin_settings_dialog_submit_button_text)))
         .inRoot(isDialog())
         .perform(click())
       onView(
@@ -480,19 +494,19 @@ class PinPasswordActivityTest {
       ).inRoot(isDialog())
         .perform(editTextInputAction.appendText("321"), closeSoftKeyboard())
 
-      onView(withText(context.getString(R.string.admin_settings_submit)))
+      onView(withText(context.getString(R.string.admin_settings_dialog_submit_button_text)))
         .inRoot(isDialog())
         .perform(click())
 
       testCoroutineDispatchers.runCurrent()
-      onView(withText(context.getString(R.string.pin_password_close)))
+      onView(withText(context.getString(R.string.pin_password_activity_close_text)))
         .inRoot(isDialog())
         .perform(click())
       onView(withId(R.id.pin_password_input_pin_edit_text)).perform(
         editTextInputAction.appendText("123"),
         closeSoftKeyboard()
       )
-      onView(withText(context.getString(R.string.pin_password_incorrect_pin)))
+      onView(withText(context.getString(R.string.pin_password_activity_incorrect_pin_error)))
         .check(matches(isDisplayed()))
     }
   }
@@ -517,7 +531,7 @@ class PinPasswordActivityTest {
       ).inRoot(isDialog())
         .perform(editTextInputAction.appendText("12345"), closeSoftKeyboard())
 
-      onView(withText(context.getString(R.string.admin_settings_submit)))
+      onView(withText(context.getString(R.string.admin_settings_dialog_submit_button_text)))
         .inRoot(isDialog())
         .perform(click())
       onView(
@@ -528,12 +542,12 @@ class PinPasswordActivityTest {
       )
         .inRoot(isDialog())
         .perform(editTextInputAction.appendText("321"), closeSoftKeyboard())
-      onView(withText(context.getString(R.string.admin_settings_submit)))
+      onView(withText(context.getString(R.string.admin_settings_dialog_submit_button_text)))
         .inRoot(isDialog())
         .perform(click())
 
       testCoroutineDispatchers.runCurrent()
-      onView(withText(context.getString(R.string.pin_password_close)))
+      onView(withText(context.getString(R.string.pin_password_activity_close_text)))
         .inRoot(isDialog())
         .perform(click())
       onView(withId(R.id.pin_password_input_pin_edit_text))
@@ -592,11 +606,11 @@ class PinPasswordActivityTest {
         )
       ).inRoot(isDialog())
         .perform(editTextInputAction.appendText("12345"), closeSoftKeyboard())
-      onView(withText(context.getString(R.string.admin_settings_submit)))
+      onView(withText(context.getString(R.string.admin_settings_dialog_submit_button_text)))
         .inRoot(isDialog())
         .perform(click())
       onView(isRoot()).perform(orientationLandscape())
-      onView(withText(context.getString(R.string.reset_pin_enter)))
+      onView(withText(context.getString(R.string.pin_password_activity_reset_pin_dialog_title)))
         .inRoot(isDialog())
         .check(matches(isDisplayed()))
     }
@@ -622,7 +636,7 @@ class PinPasswordActivityTest {
       ).inRoot(isDialog())
         .perform(editTextInputAction.appendText("12345"), closeSoftKeyboard())
 
-      onView(withText(context.getString(R.string.admin_settings_submit)))
+      onView(withText(context.getString(R.string.admin_settings_dialog_submit_button_text)))
         .inRoot(isDialog())
         .perform(click())
       onView(
@@ -634,12 +648,12 @@ class PinPasswordActivityTest {
         .inRoot(isDialog())
         .perform(editTextInputAction.appendText("123"), closeSoftKeyboard())
       onView(isRoot()).perform(orientationLandscape())
-      onView(withText(context.getString(R.string.admin_settings_submit)))
+      onView(withText(context.getString(R.string.admin_settings_dialog_submit_button_text)))
         .inRoot(isDialog())
         .perform(click())
       testCoroutineDispatchers.runCurrent()
       onView(
-        withText(context.getString(R.string.pin_password_success))
+        withText(context.getString(R.string.pin_password_activity_success_text))
       ).inRoot(isDialog()).check(matches(isDisplayed()))
     }
   }
@@ -682,14 +696,14 @@ class PinPasswordActivityTest {
         )
       ).inRoot(isDialog())
         .perform(editTextInputAction.appendText("1234"), closeSoftKeyboard())
-      onView(withText(context.getString(R.string.admin_settings_submit)))
+      onView(withText(context.getString(R.string.admin_settings_dialog_submit_button_text)))
         .inRoot(isDialog())
         .perform(click())
       onView(withId(R.id.admin_settings_input_pin))
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.admin_settings_incorrect)
+              context.resources.getString(R.string.admin_settings_dialog_incorrect_pin_error_text)
             )
           )
         )
@@ -725,14 +739,14 @@ class PinPasswordActivityTest {
         )
       ).inRoot(isDialog())
         .perform(editTextInputAction.appendText("1234"), closeSoftKeyboard())
-      onView(withText(context.getString(R.string.admin_settings_submit)))
+      onView(withText(context.getString(R.string.admin_settings_dialog_submit_button_text)))
         .inRoot(isDialog())
         .perform(click())
       onView(withId(R.id.admin_settings_input_pin))
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.admin_settings_incorrect)
+              context.resources.getString(R.string.admin_settings_dialog_incorrect_pin_error_text)
             )
           )
         )
@@ -741,7 +755,7 @@ class PinPasswordActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.admin_settings_incorrect)
+              context.resources.getString(R.string.admin_settings_dialog_incorrect_pin_error_text)
             )
           )
         )
@@ -767,14 +781,14 @@ class PinPasswordActivityTest {
         )
       ).inRoot(isDialog())
         .perform(editTextInputAction.appendText(""), closeSoftKeyboard())
-      onView(withText(context.getString(R.string.admin_settings_submit)))
+      onView(withText(context.getString(R.string.admin_settings_dialog_submit_button_text)))
         .inRoot(isDialog())
         .perform(click())
       onView(withId(R.id.admin_settings_input_pin))
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.admin_auth_null)
+              context.resources.getString(R.string.admin_auth_activity_null_pin_input_label)
             )
           )
         )
@@ -800,7 +814,7 @@ class PinPasswordActivityTest {
         )
       ).inRoot(isDialog())
         .perform(editTextInputAction.appendText(""), closeSoftKeyboard())
-      onView(withText(context.getString(R.string.admin_settings_submit)))
+      onView(withText(context.getString(R.string.admin_settings_dialog_submit_button_text)))
         .inRoot(isDialog())
         .perform(click())
       onView(isRoot()).perform(orientationLandscape())
@@ -808,7 +822,7 @@ class PinPasswordActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.admin_auth_null)
+              context.resources.getString(R.string.admin_auth_activity_null_pin_input_label)
             )
           )
         )
@@ -839,7 +853,7 @@ class PinPasswordActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.admin_auth_null)
+              context.resources.getString(R.string.admin_auth_activity_null_pin_input_label)
             )
           )
         )
@@ -870,7 +884,7 @@ class PinPasswordActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.admin_auth_null)
+              context.resources.getString(R.string.admin_auth_activity_null_pin_input_label)
             )
           )
         )
@@ -896,14 +910,14 @@ class PinPasswordActivityTest {
         )
       ).inRoot(isDialog())
         .perform(editTextInputAction.appendText(""), closeSoftKeyboard())
-      onView(withText(context.getString(R.string.admin_settings_submit)))
+      onView(withText(context.getString(R.string.admin_settings_dialog_submit_button_text)))
         .inRoot(isDialog())
         .perform(click())
       onView(withId(R.id.admin_settings_input_pin))
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.admin_auth_null)
+              context.resources.getString(R.string.admin_auth_activity_null_pin_input_label)
             )
           )
         )
@@ -940,7 +954,7 @@ class PinPasswordActivityTest {
       ).inRoot(isDialog())
         .perform(editTextInputAction.appendText("12345"), closeSoftKeyboard())
 
-      onView(withText(context.getString(R.string.admin_settings_submit)))
+      onView(withText(context.getString(R.string.admin_settings_dialog_submit_button_text)))
         .inRoot(isDialog())
         .perform(click())
       onView(
@@ -950,7 +964,7 @@ class PinPasswordActivityTest {
         )
       ).inRoot(isDialog())
         .perform(editTextInputAction.appendText("11"), closeSoftKeyboard())
-      onView(withText(context.getString(R.string.admin_settings_submit)))
+      onView(withText(context.getString(R.string.admin_settings_dialog_submit_button_text)))
         .inRoot(isDialog())
         .perform(click())
       onView(isRoot()).perform(orientationLandscape())
@@ -958,7 +972,7 @@ class PinPasswordActivityTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.add_profile_error_pin_length)
+              context.resources.getString(R.string.add_profile_activity_pin_length_error_text)
             )
           )
         )
@@ -983,7 +997,11 @@ class PinPasswordActivityTest {
       onView(isRoot()).perform(orientationLandscape())
       onView(withId(R.id.pin_password_input_pin)).check(
         matches(
-          hasErrorText(context.resources.getString(R.string.pin_password_incorrect_pin))
+          hasErrorText(
+            context.resources.getString(
+              R.string.pin_password_activity_incorrect_pin_error
+            )
+          )
         )
       )
     }
@@ -1000,7 +1018,9 @@ class PinPasswordActivityTest {
     ).use {
       testCoroutineDispatchers.runCurrent()
       closeSoftKeyboard()
-      onView(withText(context.getString(R.string.pin_password_show))).check(matches(isDisplayed()))
+      onView(withText(context.getString(R.string.pin_password_activity_show_pin_text))).check(
+        matches(isDisplayed())
+      )
     }
   }
 
@@ -1037,7 +1057,7 @@ class PinPasswordActivityTest {
         .check(
           matches(
             withContentDescription(
-              R.string.password_hidden_icon
+              R.string.pin_password_activity_hidden_icon_content_description
             )
           )
         )
@@ -1055,7 +1075,9 @@ class PinPasswordActivityTest {
     ).use {
       testCoroutineDispatchers.runCurrent()
       onView(withId(R.id.show_pin)).perform(click())
-      onView(withText(context.getString(R.string.pin_password_hide))).check(matches(isDisplayed()))
+      onView(withText(context.getString(R.string.pin_password_activity_hide_pin_text))).check(
+        matches(isDisplayed())
+      )
     }
   }
 
@@ -1075,7 +1097,7 @@ class PinPasswordActivityTest {
         .check(
           matches(
             withContentDescription(
-              R.string.password_shown_icon
+              R.string.pin_password_activity_shown_icon_content_description
             )
           )
         )
@@ -1118,7 +1140,9 @@ class PinPasswordActivityTest {
       closeSoftKeyboard()
       onView(withId(R.id.show_pin)).perform(click())
       onView(isRoot()).perform(orientationLandscape())
-      onView(withText(context.getString(R.string.pin_password_hide))).check(matches(isDisplayed()))
+      onView(withText(context.getString(R.string.pin_password_activity_hide_pin_text))).check(
+        matches(isDisplayed())
+      )
       onView(withId(R.id.show_hide_password_image_view))
         .check(
           matches(
@@ -1171,14 +1195,17 @@ class PinPasswordActivityTest {
         )
       ).inRoot(isDialog())
         .perform(editTextInputAction.appendText("12345"), closeSoftKeyboard())
-      onView(withText(context.getString(R.string.admin_settings_submit)))
+      onView(withText(context.getString(R.string.admin_settings_dialog_submit_button_text)))
         .inRoot(isDialog())
         .perform(click())
       testCoroutineDispatchers.runCurrent()
       onView(
         withText(
           containsString(
-            context.resources.getString(R.string.reset_pin_enter_dialog_message, "Ben")
+            context.resources.getString(
+              R.string.pin_password_activity_reset_pin_dialog_message,
+              "Ben"
+            )
           )
         )
       ).inRoot(isDialog()).check(matches(isDisplayed()))
@@ -1188,7 +1215,7 @@ class PinPasswordActivityTest {
   private fun getAppName(): String = context.resources.getString(R.string.app_name)
 
   private fun getPinPasswordForgotMessage(): String =
-    context.resources.getString(R.string.admin_forgot_pin_message, getAppName())
+    context.resources.getString(R.string.pin_password_activity_dialog_forgot_message, getAppName())
 
   // TODO(#59): Figure out a way to reuse modules instead of needing to re-declare them.
   @Singleton
diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt
index 8dbbf853b9b..8991e1bb998 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/profile/ProfileChooserFragmentTest.kt
@@ -163,7 +163,7 @@ class ProfileChooserFragmentTest {
     val title = activityTestRule.activity.title
     // Verify that the activity label is correct as a proxy to verify TalkBack will announce the
     // correct string when it's read out.
-    assertThat(title).isEqualTo(context.getString(R.string.profile_chooser_activity_label))
+    assertThat(title).isEqualTo(context.getString(R.string.profile_chooser_activity_title))
   }
 
   @Test
@@ -180,7 +180,7 @@ class ProfileChooserFragmentTest {
       verifyTextOnProfileListItemAtPosition(
         itemPosition = 0,
         targetView = R.id.profile_is_admin_text,
-        stringToMatch = context.getString(R.string.profile_chooser_admin)
+        stringToMatch = context.getString(R.string.profile_chooser_fragment_admin_text)
       )
       scrollToPosition(position = 1)
       verifyTextOnProfileListItemAtPosition(
@@ -199,7 +199,7 @@ class ProfileChooserFragmentTest {
       verifyTextOnProfileListItemAtPosition(
         itemPosition = 4,
         targetView = R.id.add_profile_text,
-        stringToMatch = context.getString(R.string.profile_chooser_add)
+        stringToMatch = context.getString(R.string.profile_chooser_fragment_add_text)
       )
     }
   }
@@ -221,7 +221,11 @@ class ProfileChooserFragmentTest {
       verifyTextOnProfileListItemAtPosition(
         itemPosition = 0,
         targetView = R.id.profile_last_visited,
-        stringToMatch = "${context.getString(R.string.profile_last_used)} just now"
+        stringToMatch = "${
+        context.getString(
+          R.string.profile_edit_activity_last_used_text
+        )
+        } just now"
       )
     }
   }
@@ -244,7 +248,11 @@ class ProfileChooserFragmentTest {
       verifyTextOnProfileListItemAtPosition(
         itemPosition = 0,
         targetView = R.id.profile_last_visited,
-        stringToMatch = "${context.getString(R.string.profile_last_used)} just now"
+        stringToMatch = "${
+        context.getString(
+          R.string.profile_edit_activity_last_used_text
+        )
+        } just now"
       )
     }
   }
@@ -399,7 +407,9 @@ class ProfileChooserFragmentTest {
       verifyTextOnProfileListItemAtPosition(
         itemPosition = 1,
         targetView = R.id.add_profile_text,
-        stringToMatch = context.getString(R.string.set_up_multiple_profiles)
+        stringToMatch = context.getString(
+          R.string.profile_chooser_fragment_set_up_multiple_profiles
+        )
       )
     }
   }
@@ -427,7 +437,7 @@ class ProfileChooserFragmentTest {
       verifyTextOnProfileListItemAtPosition(
         itemPosition = 4,
         targetView = R.id.add_profile_text,
-        stringToMatch = context.getString(R.string.profile_chooser_add)
+        stringToMatch = context.getString(R.string.profile_chooser_fragment_add_text)
       )
     }
   }
diff --git a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfilePictureActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfilePictureActivityTest.kt
index 5c870dc35dc..8b16c467356 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfilePictureActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfilePictureActivityTest.kt
@@ -186,7 +186,7 @@ class ProfilePictureActivityTest {
   fun testProfilePictureActivity_pressNavigateUp_finishesActivity() {
     launch(ProfilePictureActivity::class.java).use { scenario ->
       scenario.onActivity { activity ->
-        onView(withContentDescription(R.string.navigate_up)).perform(click())
+        onView(withContentDescription(R.string.navigate_up_text)).perform(click())
         assertThat(activity.isFinishing).isTrue()
       }
     }
diff --git a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt
index 9568acdecff..8a6496c621c 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/profileprogress/ProfileProgressFragmentTest.kt
@@ -323,7 +323,7 @@ class ProfileProgressFragmentTest {
       testCoroutineDispatchers.runCurrent()
       clickProfileProgressItem(itemPosition = 0, targetViewId = R.id.profile_edit_image)
       testCoroutineDispatchers.runCurrent()
-      verifyTextInDialog(context.getString(R.string.profile_progress_edit_dialog_title))
+      verifyTextInDialog(context.getString(R.string.profile_picture_edit_dialog_title))
     }
   }
 
@@ -332,9 +332,9 @@ class ProfileProgressFragmentTest {
     launch<ProfileProgressActivity>(createProfileProgressActivityIntent(internalProfileId)).use {
       testCoroutineDispatchers.runCurrent()
       clickProfileProgressItem(itemPosition = 0, targetViewId = R.id.profile_edit_image)
-      verifyTextInDialog(context.getString(R.string.profile_progress_edit_dialog_title))
+      verifyTextInDialog(context.getString(R.string.profile_picture_edit_dialog_title))
       onView(isRoot()).perform(orientationLandscape())
-      onView(withText(R.string.profile_progress_edit_dialog_title)).check(matches(isDisplayed()))
+      onView(withText(R.string.profile_picture_edit_dialog_title)).check(matches(isDisplayed()))
     }
   }
 
@@ -349,8 +349,8 @@ class ProfileProgressFragmentTest {
     launch<ProfileProgressActivity>(createProfileProgressActivityIntent(internalProfileId)).use {
       testCoroutineDispatchers.runCurrent()
       clickProfileProgressItem(itemPosition = 0, targetViewId = R.id.profile_edit_image)
-      verifyTextInDialog(context.getString(R.string.profile_progress_edit_dialog_title))
-      onView(withText(R.string.profile_picture_edit_alert_dialog_choose_from_library))
+      verifyTextInDialog(context.getString(R.string.profile_picture_edit_dialog_title))
+      onView(withText(R.string.profile_picture_edit_dialog_change_picture_text))
         .perform(click())
       intended(expectedIntent)
     }
@@ -368,8 +368,8 @@ class ProfileProgressFragmentTest {
       onView(isRoot()).perform(orientationLandscape())
       testCoroutineDispatchers.runCurrent()
       clickProfileProgressItem(itemPosition = 0, targetViewId = R.id.profile_edit_image)
-      verifyTextInDialog(context.getString(R.string.profile_progress_edit_dialog_title))
-      onView(withText(R.string.profile_picture_edit_alert_dialog_choose_from_library))
+      verifyTextInDialog(context.getString(R.string.profile_picture_edit_dialog_title))
+      onView(withText(R.string.profile_picture_edit_dialog_change_picture_text))
         .perform(click())
       intended(expectedIntent)
     }
@@ -380,11 +380,11 @@ class ProfileProgressFragmentTest {
     launch<ProfileProgressActivity>(createProfileProgressActivityIntent(internalProfileId)).use {
       testCoroutineDispatchers.runCurrent()
       clickProfileProgressItem(itemPosition = 0, targetViewId = R.id.profile_edit_image)
-      verifyTextInDialog(context.getString(R.string.profile_progress_edit_dialog_title))
+      verifyTextInDialog(context.getString(R.string.profile_picture_edit_dialog_title))
       testCoroutineDispatchers.runCurrent()
       onView(isRoot()).perform(orientationLandscape())
       testCoroutineDispatchers.runCurrent()
-      verifyTextInDialog(context.getString(R.string.profile_progress_edit_dialog_title))
+      verifyTextInDialog(context.getString(R.string.profile_picture_edit_dialog_title))
     }
   }
 
@@ -459,7 +459,9 @@ class ProfileProgressFragmentTest {
       verifyItemDisplayedOnProfileProgressListItem(
         itemPosition = 0,
         targetViewId = R.id.ongoing_topics_description_text_view,
-        stringToMatch = context.getString(R.string.topics_in_progress)
+        stringToMatch = context.getString(
+          R.string.profile_progress_activity_topics_in_progress_text
+        )
       )
     }
   }
@@ -484,7 +486,9 @@ class ProfileProgressFragmentTest {
       verifyItemDisplayedOnProfileProgressListItem(
         itemPosition = 0,
         targetViewId = R.id.ongoing_topics_description_text_view,
-        stringToMatch = context.getString(R.string.topics_in_progress)
+        stringToMatch = context.getString(
+          R.string.profile_progress_activity_topics_in_progress_text
+        )
       )
     }
   }
@@ -511,7 +515,9 @@ class ProfileProgressFragmentTest {
       verifyItemDisplayedOnProfileProgressListItem(
         itemPosition = 0,
         targetViewId = R.id.ongoing_topics_description_text_view,
-        stringToMatch = context.getString(R.string.topics_in_progress)
+        stringToMatch = context.getString(
+          R.string.profile_progress_activity_topics_in_progress_text
+        )
       )
     }
   }
@@ -556,7 +562,7 @@ class ProfileProgressFragmentTest {
       verifyItemDisplayedOnProfileProgressListItem(
         itemPosition = 0,
         targetViewId = R.id.completed_stories_description_text_view,
-        stringToMatch = context.getString(R.string.stories_completed)
+        stringToMatch = context.getString(R.string.profile_progress_activity_stories_completed_text)
       )
     }
   }
@@ -576,7 +582,7 @@ class ProfileProgressFragmentTest {
       verifyItemDisplayedOnProfileProgressListItem(
         itemPosition = 0,
         targetViewId = R.id.completed_stories_description_text_view,
-        stringToMatch = context.getString(R.string.stories_completed)
+        stringToMatch = context.getString(R.string.profile_progress_activity_stories_completed_text)
       )
     }
   }
diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt
index b06938a9be7..0b4355c3def 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditActivityTest.kt
@@ -241,7 +241,7 @@ class ProfileEditActivityTest {
       )
     ).use {
       onView(withId(R.id.profile_delete_button)).perform(click())
-      onView(withText(R.string.profile_edit_delete_dialog_positive))
+      onView(withText(R.string.profile_edit_activity_dialog_positive_button))
         .inRoot(isDialog())
         .perform(click())
       testCoroutineDispatchers.runCurrent()
@@ -263,7 +263,7 @@ class ProfileEditActivityTest {
     ).use {
       onView(isRoot()).perform(orientationLandscape())
       onView(withId(R.id.profile_delete_button)).perform(scrollTo()).perform(click())
-      onView(withText(R.string.profile_edit_delete_dialog_positive))
+      onView(withText(R.string.profile_edit_activity_dialog_positive_button))
         .inRoot(isDialog())
         .perform(click())
       testCoroutineDispatchers.runCurrent()
diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt
index 5c28e75d5d9..38b8639caae 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileEditFragmentTest.kt
@@ -153,7 +153,7 @@ class ProfileEditFragmentTest {
   fun testProfileEdit_startWithUserProfile_clickProfileDeletionButton_checkOpensDeletionDialog() {
     launchFragmentTestActivity(internalProfileId = 1).use {
       onView(withId(R.id.profile_delete_button)).perform(click())
-      onView(withText(R.string.profile_edit_delete_dialog_message))
+      onView(withText(R.string.profile_edit_activity_dialog_message))
         .inRoot(isDialog()).check(matches(isDisplayed()))
     }
   }
@@ -165,7 +165,7 @@ class ProfileEditFragmentTest {
       onView(isRoot()).perform(orientationLandscape())
       onView(withId(R.id.profile_delete_button)).perform(scrollTo()).perform(click())
       testCoroutineDispatchers.runCurrent()
-      onView(withText(R.string.profile_edit_delete_dialog_message))
+      onView(withText(R.string.profile_edit_activity_dialog_message))
         .inRoot(isDialog()).check(matches(isDisplayed()))
     }
   }
@@ -177,7 +177,7 @@ class ProfileEditFragmentTest {
       onView(withId(R.id.profile_delete_button)).perform(scrollTo()).perform(click())
       onView(isRoot()).perform(orientationLandscape())
       testCoroutineDispatchers.runCurrent()
-      onView(withText(R.string.profile_edit_delete_dialog_message))
+      onView(withText(R.string.profile_edit_activity_dialog_message))
         .inRoot(isDialog()).check(matches(isCompletelyDisplayed()))
     }
   }
diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt
index f57ca938ce6..5e5a7d9a850 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileListFragmentTest.kt
@@ -167,7 +167,7 @@ class ProfileListFragmentTest {
           targetViewId = R.id.profile_list_admin_text
         )
       ).check(
-        matches(withText(context.getString(R.string.profile_chooser_admin)))
+        matches(withText(context.getString(R.string.profile_chooser_fragment_admin_text)))
       )
       onView(withId(R.id.profile_list_recycler_view)).perform(
         scrollToPosition<RecyclerView.ViewHolder>(
@@ -222,7 +222,7 @@ class ProfileListFragmentTest {
           targetViewId = R.id.profile_list_admin_text
         )
       ).check(
-        matches(withText(context.getString(R.string.profile_chooser_admin)))
+        matches(withText(context.getString(R.string.profile_chooser_fragment_admin_text)))
       )
       onView(withId(R.id.profile_list_recycler_view)).perform(
         scrollToPosition<RecyclerView.ViewHolder>(
diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameFragmentTest.kt
index b1e253d60f0..bf218f80521 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileRenameFragmentTest.kt
@@ -270,7 +270,7 @@ class ProfileRenameFragmentTest {
         matches(
           hasErrorText(
             context.resources.getString(
-              R.string.add_profile_error_name_not_unique
+              R.string.add_profile_activity_name_not_unique_error_text
             )
           )
         )
@@ -325,7 +325,9 @@ class ProfileRenameFragmentTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.add_profile_error_name_only_letters)
+              context.resources.getString(
+                R.string.add_profile_activity_name_only_letters_error_text
+              )
             )
           )
         )
@@ -419,7 +421,7 @@ class ProfileRenameFragmentTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.add_profile_error_name_not_unique)
+              context.resources.getString(R.string.add_profile_activity_name_not_unique_error_text)
             )
           )
         )
diff --git a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinFragmentTest.kt
index 830f3f885de..1ab8ed5636f 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/settings/profile/ProfileResetPinFragmentTest.kt
@@ -332,7 +332,9 @@ class ProfileResetPinFragmentTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.profile_reset_pin_error_admin_pin_length)
+              context.resources.getString(
+                R.string.profile_reset_pin_fragment_error_admin_pin_length
+              )
             )
           )
         )
@@ -373,7 +375,9 @@ class ProfileResetPinFragmentTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.profile_reset_pin_error_admin_pin_length)
+              context.resources.getString(
+                R.string.profile_reset_pin_fragment_error_admin_pin_length
+              )
             )
           )
         )
@@ -479,7 +483,9 @@ class ProfileResetPinFragmentTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.add_profile_error_pin_confirm_wrong)
+              context.resources.getString(
+                R.string.add_profile_activity_wrong_confirm_pin_error_text
+              )
             )
           )
         )
@@ -521,7 +527,9 @@ class ProfileResetPinFragmentTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.add_profile_error_pin_confirm_wrong)
+              context.resources.getString(
+                R.string.add_profile_activity_wrong_confirm_pin_error_text
+              )
             )
           )
         )
@@ -651,7 +659,7 @@ class ProfileResetPinFragmentTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.profile_reset_pin_error_user_pin_length)
+              context.resources.getString(R.string.profile_reset_pin_fragment_error_user_pin_length)
             )
           )
         )
@@ -723,7 +731,9 @@ class ProfileResetPinFragmentTest {
         .check(
           matches(
             hasErrorText(
-              context.resources.getString(R.string.add_profile_error_pin_confirm_wrong)
+              context.resources.getString(
+                R.string.add_profile_activity_wrong_confirm_pin_error_text
+              )
             )
           )
         )
diff --git a/app/src/sharedTest/java/org/oppia/android/app/splash/SplashActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/splash/SplashActivityTest.kt
index 4483d5e3e6c..8d0f2488cfb 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/splash/SplashActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/splash/SplashActivityTest.kt
@@ -907,7 +907,7 @@ class SplashActivityTest {
     launchSplashActivityFully {
       onView(withId(R.id.build_flavor_label)).check(matches(isDisplayed()))
       onView(withId(R.id.build_flavor_label))
-        .check(matches(withText(R.string.splash_screen_developer_label)))
+        .check(matches(withText(R.string.splash_activity_build_developer_label)))
     }
   }
 
@@ -921,7 +921,7 @@ class SplashActivityTest {
     launchSplashActivityFully {
       onView(withId(R.id.build_flavor_label)).check(matches(isDisplayed()))
       onView(withId(R.id.build_flavor_label))
-        .check(matches(withText(R.string.splash_screen_alpha_label)))
+        .check(matches(withText(R.string.splash_activity_build_alpha_label)))
     }
   }
 
@@ -935,7 +935,7 @@ class SplashActivityTest {
     launchSplashActivityFully {
       onView(withId(R.id.build_flavor_label)).check(matches(isDisplayed()))
       onView(withId(R.id.build_flavor_label))
-        .check(matches(withText(R.string.splash_screen_beta_label)))
+        .check(matches(withText(R.string.splash_activity_build_beta_label)))
     }
   }
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
index 21202b8915d..0de2c96013b 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/story/StoryFragmentTest.kt
@@ -216,7 +216,7 @@ class StoryFragmentTest {
   fun testStoryFragment_clickOnToolbarNavigationButton_closeActivity() {
     activityTestRule.launchActivity(createFractionsStoryActivityIntent())
     testCoroutineDispatchers.runCurrent()
-    onView(withContentDescription(R.string.navigate_up)).perform(click())
+    onView(withContentDescription(R.string.navigate_up_text)).perform(click())
     assertThat(activityTestRule.activity.isFinishing).isTrue()
   }
 
@@ -338,7 +338,13 @@ class StoryFragmentTest {
           position = 1,
           targetViewId = R.id.chapter_completed_tick
         )
-      ).check(matches(withContentDescription(R.string.chapter_completed)))
+      ).check(
+        matches(
+          withContentDescription(
+            R.string.topic_fragment_lessons_chapter_completed_text
+          )
+        )
+      )
     }
   }
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyFragmentTest.kt
index 4ac59d07d5b..9a051341487 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/survey/SurveyFragmentTest.kt
@@ -183,7 +183,7 @@ class SurveyFragmentTest {
       createSurveyActivityIntent()
     ).use {
       testCoroutineDispatchers.runCurrent()
-      onView(withContentDescription(R.string.survey_exit_button_description))
+      onView(withContentDescription(R.string.survey_activity_exit_dialog_exit_button_description))
         .check(
           matches(
             withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)
@@ -234,7 +234,7 @@ class SurveyFragmentTest {
       createSurveyActivityIntent()
     ).use {
       testCoroutineDispatchers.runCurrent()
-      onView(withText(R.string.user_type_question))
+      onView(withText(R.string.survey_fragment_user_type_question))
         .check(matches(isDisplayed()))
       onView(withId(R.id.survey_next_button))
         .check(matches(isDisplayed()))
@@ -254,7 +254,7 @@ class SurveyFragmentTest {
         RecyclerViewActions.scrollToPosition<RecyclerView.ViewHolder>(
           0
         )
-      ).check(matches(hasDescendant(withText(R.string.user_type_answer_learner))))
+      ).check(matches(hasDescendant(withText(R.string.survey_fragment_user_type_answer_learner))))
     }
   }
 
@@ -264,8 +264,8 @@ class SurveyFragmentTest {
     launch<SurveyActivity>(
       createSurveyActivityIntent()
     ).use {
-      onView(withContentDescription(R.string.navigate_up)).perform(click())
-      onView(withText(context.getString(R.string.survey_exit_confirmation_text)))
+      onView(withContentDescription(R.string.navigate_up_text)).perform(click())
+      onView(withText(context.getString(R.string.survey_activity_exit_dialog_confirmation_text)))
         .inRoot(isDialog())
         .check(matches(isDisplayed()))
     }
@@ -292,7 +292,15 @@ class SurveyFragmentTest {
         RecyclerViewActions.scrollToPosition<RecyclerView.ViewHolder>(
           0
         )
-      ).check(matches(hasDescendant(withText(R.string.market_fit_answer_very_disappointed))))
+      ).check(
+        matches(
+          hasDescendant(
+            withText(
+              R.string.survey_fragment_market_fit_answer_very_disappointed
+            )
+          )
+        )
+      )
     }
   }
 
@@ -346,7 +354,7 @@ class SurveyFragmentTest {
       // Select and submit NpsAnswer
       selectNpsAnswerAndMoveToNextQuestion(3)
 
-      onView(withText(R.string.nps_detractor_feedback_question))
+      onView(withText(R.string.survey_fragment_nps_detractor_feedback_question))
         .check(matches(isDisplayed()))
       onView(withId(R.id.submit_button))
         .check(matches(isDisplayed()))
@@ -374,7 +382,7 @@ class SurveyFragmentTest {
       // Select and submit NpsAnswer
       selectNpsAnswerAndMoveToNextQuestion(8)
 
-      onView(withText(R.string.nps_passive_feedback_question))
+      onView(withText(R.string.survey_fragment_nps_passive_feedback_question))
         .check(matches(isDisplayed()))
       onView(withId(R.id.submit_button))
         .check(matches(isDisplayed()))
@@ -450,7 +458,7 @@ class SurveyFragmentTest {
           position = 0,
           targetViewId = R.id.multiple_choice_content_text_view
         )
-      ).check(matches(withText(R.string.user_type_answer_learner)))
+      ).check(matches(withText(R.string.survey_fragment_user_type_answer_learner)))
     }
   }
 
@@ -491,7 +499,7 @@ class SurveyFragmentTest {
           position = 0,
           targetViewId = R.id.multiple_choice_content_text_view
         )
-      ).check(matches(withText(R.string.market_fit_answer_very_disappointed)))
+      ).check(matches(withText(R.string.survey_fragment_market_fit_answer_very_disappointed)))
 
       // Move back to UserType question
       moveToPreviousQuestion()
@@ -514,7 +522,7 @@ class SurveyFragmentTest {
           position = 0,
           targetViewId = R.id.multiple_choice_content_text_view
         )
-      ).check(matches(withText(R.string.user_type_answer_learner)))
+      ).check(matches(withText(R.string.survey_fragment_user_type_answer_learner)))
     }
   }
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityDebugTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityDebugTest.kt
index 1b25eeb4eba..a026548146f 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityDebugTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityDebugTest.kt
@@ -206,17 +206,17 @@ class NavigationDrawerActivityDebugTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.developer_options)).perform(click())
+      onView(withText(R.string.navigation_drawer_fragment_developer_options)).perform(click())
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_switch_profile)).perform(click())
-      onView(withText(R.string.home_activity_back_dialog_cancel))
+      onView(withText(R.string.navigation_drawer_fragment_switch_profile)).perform(click())
+      onView(withText(R.string.home_activity_back_dialog_cancel_button))
         .inRoot(isDialog())
         .perform(click())
       it.openNavigationDrawer()
       testCoroutineDispatchers.runCurrent()
       onView(
         allOf(
-          withText(R.string.developer_options),
+          withText(R.string.navigation_drawer_fragment_developer_options),
           isDescendantOfA(withId(R.id.developer_options_linear_layout))
         )
       ).check(
@@ -237,10 +237,10 @@ class NavigationDrawerActivityDebugTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.developer_options)).perform(click())
+      onView(withText(R.string.navigation_drawer_fragment_developer_options)).perform(click())
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_switch_profile)).perform(click())
-      onView(withText(R.string.home_activity_back_dialog_cancel))
+      onView(withText(R.string.navigation_drawer_fragment_switch_profile)).perform(click())
+      onView(withText(R.string.home_activity_back_dialog_cancel_button))
         .inRoot(isDialog())
         .perform(click())
       it.openNavigationDrawer()
@@ -249,7 +249,7 @@ class NavigationDrawerActivityDebugTest {
       testCoroutineDispatchers.runCurrent()
       onView(
         allOf(
-          withText(R.string.developer_options),
+          withText(R.string.navigation_drawer_fragment_developer_options),
           isDescendantOfA(withId(R.id.developer_options_linear_layout))
         )
       ).check(
@@ -270,7 +270,7 @@ class NavigationDrawerActivityDebugTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.developer_options)).perform(click())
+      onView(withText(R.string.navigation_drawer_fragment_developer_options)).perform(click())
       onView(isRoot()).perform(pressBack())
       it.openNavigationDrawer()
       onView(withId(R.id.fragment_drawer_nav_view))
@@ -286,7 +286,7 @@ class NavigationDrawerActivityDebugTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.developer_options)).perform(click())
+      onView(withText(R.string.navigation_drawer_fragment_developer_options)).perform(click())
       onView(isRoot()).perform(pressBack())
       it.openNavigationDrawer()
       onView(isRoot()).perform(orientationLandscape())
@@ -338,7 +338,7 @@ class NavigationDrawerActivityDebugTest {
   }
 
   private fun ActivityScenario<NavigationDrawerTestActivity>.openNavigationDrawer() {
-    onView(withContentDescription(R.string.drawer_open_content_description))
+    onView(withContentDescription(R.string.navigation_drawer_fragment_open_content_description))
       .check(matches(isCompletelyDisplayed()))
       .perform(click())
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityProdTest.kt b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityProdTest.kt
index 08512202fb7..2b49cf796ea 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityProdTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/testing/NavigationDrawerActivityProdTest.kt
@@ -342,8 +342,8 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_switch_profile)).perform(click())
-      onView(withText(R.string.home_activity_back_dialog_cancel))
+      onView(withText(R.string.navigation_drawer_fragment_switch_profile)).perform(click())
+      onView(withText(R.string.home_activity_back_dialog_cancel_button))
         .inRoot(isDialog())
         .perform(click())
       it.openNavigationDrawer()
@@ -361,10 +361,10 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_options)).perform(click())
+      onView(withText(R.string.menu_options_text)).perform(click())
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_switch_profile)).perform(click())
-      onView(withText(R.string.home_activity_back_dialog_cancel))
+      onView(withText(R.string.navigation_drawer_fragment_switch_profile)).perform(click())
+      onView(withText(R.string.home_activity_back_dialog_cancel_button))
         .inRoot(isDialog())
         .perform(click())
       it.openNavigationDrawer()
@@ -382,10 +382,10 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_help)).perform(click())
+      onView(withText(R.string.menu_help_text)).perform(click())
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_switch_profile)).perform(click())
-      onView(withText(R.string.home_activity_back_dialog_cancel))
+      onView(withText(R.string.navigation_drawer_fragment_switch_profile)).perform(click())
+      onView(withText(R.string.home_activity_back_dialog_cancel_button))
         .inRoot(isDialog())
         .perform(click())
       it.openNavigationDrawer()
@@ -405,10 +405,10 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_my_downloads)).perform(click())
+      onView(withText(R.string.navigation_drawer_fragment_menu_my_downloads_text)).perform(click())
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_switch_profile)).perform(click())
-      onView(withText(R.string.home_activity_back_dialog_cancel))
+      onView(withText(R.string.navigation_drawer_fragment_switch_profile)).perform(click())
+      onView(withText(R.string.home_activity_back_dialog_cancel_button))
         .inRoot(isDialog())
         .perform(click())
       it.openNavigationDrawer()
@@ -426,17 +426,17 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.administrator_controls)).perform(click())
+      onView(withText(R.string.administrator_controls_activity_title)).perform(click())
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_switch_profile)).perform(click())
-      onView(withText(R.string.home_activity_back_dialog_cancel))
+      onView(withText(R.string.navigation_drawer_fragment_switch_profile)).perform(click())
+      onView(withText(R.string.home_activity_back_dialog_cancel_button))
         .inRoot(isDialog())
         .perform(click())
       it.openNavigationDrawer()
       testCoroutineDispatchers.runCurrent()
       onView(
         allOf(
-          withText(R.string.administrator_controls),
+          withText(R.string.administrator_controls_activity_title),
           isDescendantOfA(withId(R.id.administrator_controls_linear_layout))
         )
       ).check(matches(hasTextColor(R.color.component_color_drawer_fragment_selected_text_color)))
@@ -451,8 +451,8 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_switch_profile)).perform(click())
-      onView(withText(R.string.home_activity_back_dialog_cancel))
+      onView(withText(R.string.navigation_drawer_fragment_switch_profile)).perform(click())
+      onView(withText(R.string.home_activity_back_dialog_cancel_button))
         .inRoot(isDialog())
         .perform(click())
       it.openNavigationDrawer()
@@ -471,10 +471,10 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_options)).perform(click())
+      onView(withText(R.string.menu_options_text)).perform(click())
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_switch_profile)).perform(click())
-      onView(withText(R.string.home_activity_back_dialog_cancel))
+      onView(withText(R.string.navigation_drawer_fragment_switch_profile)).perform(click())
+      onView(withText(R.string.home_activity_back_dialog_cancel_button))
         .inRoot(isDialog())
         .perform(click())
       it.openNavigationDrawer()
@@ -493,10 +493,10 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_help)).perform(click())
+      onView(withText(R.string.menu_help_text)).perform(click())
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_switch_profile)).perform(click())
-      onView(withText(R.string.home_activity_back_dialog_cancel))
+      onView(withText(R.string.navigation_drawer_fragment_switch_profile)).perform(click())
+      onView(withText(R.string.home_activity_back_dialog_cancel_button))
         .inRoot(isDialog())
         .perform(click())
       it.openNavigationDrawer()
@@ -517,10 +517,10 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_my_downloads)).perform(click())
+      onView(withText(R.string.navigation_drawer_fragment_menu_my_downloads_text)).perform(click())
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_switch_profile)).perform(click())
-      onView(withText(R.string.home_activity_back_dialog_cancel))
+      onView(withText(R.string.navigation_drawer_fragment_switch_profile)).perform(click())
+      onView(withText(R.string.home_activity_back_dialog_cancel_button))
         .inRoot(isDialog())
         .perform(click())
       it.openNavigationDrawer()
@@ -538,10 +538,10 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.administrator_controls)).perform(click())
+      onView(withText(R.string.administrator_controls_activity_title)).perform(click())
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_switch_profile)).perform(click())
-      onView(withText(R.string.home_activity_back_dialog_cancel))
+      onView(withText(R.string.navigation_drawer_fragment_switch_profile)).perform(click())
+      onView(withText(R.string.home_activity_back_dialog_cancel_button))
         .inRoot(isDialog())
         .perform(click())
       it.openNavigationDrawer()
@@ -550,7 +550,7 @@ class NavigationDrawerActivityProdTest {
       testCoroutineDispatchers.runCurrent()
       onView(
         allOf(
-          withText(R.string.administrator_controls),
+          withText(R.string.administrator_controls_activity_title),
           isDescendantOfA(withId(R.id.administrator_controls_linear_layout))
         )
       ).check(matches(hasTextColor(R.color.component_color_drawer_fragment_selected_text_color)))
@@ -565,7 +565,7 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_options)).perform(click())
+      onView(withText(R.string.menu_options_text)).perform(click())
       onView(isRoot()).perform(pressBack())
       it.openNavigationDrawer()
       onView(withId(R.id.fragment_drawer_nav_view))
@@ -581,7 +581,7 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_help)).perform(click())
+      onView(withText(R.string.menu_help_text)).perform(click())
       onView(isRoot()).perform(pressBack())
       it.openNavigationDrawer()
       onView(withId(R.id.fragment_drawer_nav_view))
@@ -599,7 +599,7 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_my_downloads)).perform(click())
+      onView(withText(R.string.navigation_drawer_fragment_menu_my_downloads_text)).perform(click())
       onView(isRoot()).perform(pressBack())
       it.openNavigationDrawer()
       onView(withId(R.id.fragment_drawer_nav_view))
@@ -615,7 +615,7 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_switch_profile)).perform(click())
+      onView(withText(R.string.navigation_drawer_fragment_switch_profile)).perform(click())
       onView(isRoot()).perform(pressBack())
       it.openNavigationDrawer()
       onView(withId(R.id.fragment_drawer_nav_view))
@@ -631,7 +631,7 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.administrator_controls)).perform(click())
+      onView(withText(R.string.administrator_controls_activity_title)).perform(click())
       onView(isRoot()).perform(pressBack())
       it.openNavigationDrawer()
       onView(withId(R.id.fragment_drawer_nav_view))
@@ -647,7 +647,7 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_options)).perform(click())
+      onView(withText(R.string.menu_options_text)).perform(click())
       onView(isRoot()).perform(pressBack())
       it.openNavigationDrawer()
       onView(isRoot()).perform(orientationLandscape())
@@ -664,7 +664,7 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_help)).perform(click())
+      onView(withText(R.string.menu_help_text)).perform(click())
       onView(isRoot()).perform(pressBack())
       it.openNavigationDrawer()
       onView(isRoot()).perform(orientationLandscape())
@@ -683,7 +683,7 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_my_downloads)).perform(click())
+      onView(withText(R.string.navigation_drawer_fragment_menu_my_downloads_text)).perform(click())
       onView(isRoot()).perform(pressBack())
       it.openNavigationDrawer()
       onView(isRoot()).perform(orientationLandscape())
@@ -700,7 +700,7 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_switch_profile)).perform(click())
+      onView(withText(R.string.navigation_drawer_fragment_switch_profile)).perform(click())
       onView(isRoot()).perform(pressBack())
       it.openNavigationDrawer()
       onView(isRoot()).perform(orientationLandscape())
@@ -717,7 +717,7 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.administrator_controls)).perform(click())
+      onView(withText(R.string.administrator_controls_activity_title)).perform(click())
       onView(isRoot()).perform(pressBack())
       it.openNavigationDrawer()
       onView(isRoot()).perform(orientationLandscape())
@@ -803,7 +803,7 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_my_downloads)).perform(click())
+      onView(withText(R.string.navigation_drawer_fragment_menu_my_downloads_text)).perform(click())
       intended(hasComponent(MyDownloadsActivity::class.java.name))
     }
   }
@@ -814,7 +814,7 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_switch_profile)).perform(click())
+      onView(withText(R.string.navigation_drawer_fragment_switch_profile)).perform(click())
       onView(withText(R.string.home_activity_back_dialog_message))
         .inRoot(isDialog())
         .check(matches(isDisplayed()))
@@ -827,11 +827,11 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_switch_profile)).perform(click())
+      onView(withText(R.string.navigation_drawer_fragment_switch_profile)).perform(click())
       onView(withText(R.string.home_activity_back_dialog_message))
         .inRoot(isDialog())
         .check(matches(isDisplayed()))
-      onView(withText(R.string.home_activity_back_dialog_exit))
+      onView(withText(R.string.home_activity_back_dialog_exit_button))
         .inRoot(isDialog())
         .perform(click())
       intended(hasComponent(ProfileChooserActivity::class.java.name))
@@ -858,11 +858,11 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_switch_profile)).perform(click())
+      onView(withText(R.string.navigation_drawer_fragment_switch_profile)).perform(click())
       onView(withText(R.string.home_activity_back_dialog_message))
         .inRoot(isDialog())
         .check(matches(isDisplayed()))
-      onView(withText(R.string.home_activity_back_dialog_cancel))
+      onView(withText(R.string.home_activity_back_dialog_cancel_button))
         .inRoot(isDialog())
         .perform(click())
       testCoroutineDispatchers.runCurrent()
@@ -876,7 +876,7 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_switch_profile)).perform(click())
+      onView(withText(R.string.navigation_drawer_fragment_switch_profile)).perform(click())
       onView(withText(R.string.home_activity_back_dialog_message))
         .inRoot(isDialog())
         .check(matches(isDisplayed()))
@@ -891,13 +891,13 @@ class NavigationDrawerActivityProdTest {
       createNavigationDrawerActivityIntent(internalProfileId)
     ).use {
       it.openNavigationDrawer()
-      onView(withText(R.string.menu_help)).perform(click())
+      onView(withText(R.string.menu_help_text)).perform(click())
       intended(hasComponent(HelpActivity::class.java.name))
     }
   }
 
   private fun ActivityScenario<NavigationDrawerTestActivity>.openNavigationDrawer() {
-    onView(withContentDescription(R.string.drawer_open_content_description))
+    onView(withContentDescription(R.string.navigation_drawer_fragment_open_content_description))
       .check(matches(isCompletelyDisplayed()))
       .perform(click())
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt
index a765068fde4..686e5eb9ff7 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicActivityTest.kt
@@ -174,7 +174,7 @@ class TopicActivityTest {
 
       // Verify that the activity label is correct as a proxy to verify TalkBack will announce the
       // correct string when it's read out.
-      assertThat(title).isEqualTo(context.getString(R.string.topic_page))
+      assertThat(title).isEqualTo(context.getString(R.string.topic_activity_title))
     }
   }
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt
index 333cab9044e..5b5048bb058 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/TopicFragmentTest.kt
@@ -213,7 +213,7 @@ class TopicFragmentTest {
 
     launch<TopicActivity>(createTopicActivityIntent(internalProfileId, FRACTIONS_TOPIC_ID)).use {
       testCoroutineDispatchers.runCurrent()
-      onView(withText(R.string.topic_lessons_tab_spotlight_hint)).check(doesNotExist())
+      onView(withText(R.string.topic_fragment_lessons_tab_spotlight_hint)).check(doesNotExist())
     }
   }
 
@@ -227,7 +227,11 @@ class TopicFragmentTest {
       )
     )
     testCoroutineDispatchers.runCurrent()
-    onView(withText(R.string.topic_lessons_tab_spotlight_hint)).check(matches(isDisplayed()))
+    onView(
+      withText(
+        R.string.topic_fragment_lessons_tab_spotlight_hint
+      )
+    ).check(matches(isDisplayed()))
   }
 
   @Test
@@ -242,7 +246,11 @@ class TopicFragmentTest {
       )
     )
     testCoroutineDispatchers.runCurrent()
-    onView(withText(R.string.first_chapter_spotlight_hint)).check(matches(isDisplayed()))
+    onView(
+      withText(
+        R.string.topic_fragment_first_chapter_spotlight_hint
+      )
+    ).check(matches(isDisplayed()))
   }
 
   @Test
@@ -270,7 +278,7 @@ class TopicFragmentTest {
       )
     ).use {
       testCoroutineDispatchers.runCurrent()
-      onView(withText(R.string.first_chapter_spotlight_hint)).check(doesNotExist())
+      onView(withText(R.string.topic_fragment_first_chapter_spotlight_hint)).check(doesNotExist())
     }
   }
 
@@ -289,7 +297,11 @@ class TopicFragmentTest {
     ).use {
       testCoroutineDispatchers.runCurrent()
 
-      onView(withText(R.string.topic_revision_tab_spotlight_hint)).check(matches(isDisplayed()))
+      onView(withText(R.string.topic_fragment_revision_tab_spotlight_hint)).check(
+        matches(
+          isDisplayed()
+        )
+      )
     }
   }
 
@@ -302,7 +314,7 @@ class TopicFragmentTest {
       createTopicPlayStoryActivityIntent(internalProfileId, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0)
     ).use {
       testCoroutineDispatchers.runCurrent()
-      onView(withText(R.string.topic_revision_tab_spotlight_hint)).check(doesNotExist())
+      onView(withText(R.string.topic_fragment_revision_tab_spotlight_hint)).check(doesNotExist())
     }
   }
 
@@ -328,7 +340,7 @@ class TopicFragmentTest {
       createTopicPlayStoryActivityIntent(internalProfileId, RATIOS_TOPIC_ID, RATIOS_STORY_ID_0)
     ).use {
       testCoroutineDispatchers.runCurrent()
-      onView(withText(R.string.topic_revision_tab_spotlight_hint)).check(doesNotExist())
+      onView(withText(R.string.topic_fragment_revision_tab_spotlight_hint)).check(doesNotExist())
     }
   }
 
@@ -427,7 +439,7 @@ class TopicFragmentTest {
         FRACTIONS_TOPIC_ID
       )
     )
-    onView(withContentDescription(R.string.navigate_up)).perform(click())
+    onView(withContentDescription(R.string.navigate_up_text)).perform(click())
     assertThat(activityTestRule.activity.isFinishing).isTrue()
   }
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt
index fcad7bafb88..6d142d3ac34 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/conceptcard/ConceptCardFragmentTest.kt
@@ -185,7 +185,7 @@ class ConceptCardFragmentTest {
       onView(withId(R.id.open_dialog_0)).perform(click())
       testCoroutineDispatchers.runCurrent()
 
-      onView(withContentDescription(R.string.navigate_up))
+      onView(withContentDescription(R.string.navigate_up_text))
         .inRoot(isDialog())
         .perform(click())
       testCoroutineDispatchers.runCurrent()
@@ -205,7 +205,7 @@ class ConceptCardFragmentTest {
           instanceOf(TextView::class.java),
           withParent(withId(R.id.concept_card_toolbar))
         )
-      ).inRoot(isDialog()).check(matches(withText(R.string.concept_card_toolbar_title)))
+      ).inRoot(isDialog()).check(matches(withText(R.string.concept_card_fragment_title)))
     }
   }
 
@@ -222,7 +222,7 @@ class ConceptCardFragmentTest {
           instanceOf(TextView::class.java),
           withParent(withId(R.id.concept_card_toolbar))
         )
-      ).inRoot(isDialog()).check(matches(withText(R.string.concept_card_toolbar_title)))
+      ).inRoot(isDialog()).check(matches(withText(R.string.concept_card_fragment_title)))
     }
   }
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt
index 0acdf90b1a6..29cd6d49b7b 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/info/TopicInfoFragmentTest.kt
@@ -348,7 +348,13 @@ class TopicInfoFragmentTest {
       )
       onView(withId(R.id.see_more_text_view)).perform(scrollTo())
       onView(withId(R.id.see_more_text_view)).check(matches(isDisplayed()))
-      onView(withId(R.id.see_more_text_view)).check(matches(withText(R.string.see_more)))
+      onView(withId(R.id.see_more_text_view)).check(
+        matches(
+          withText(
+            R.string.topic_fragment_info_see_more_text
+          )
+        )
+      )
     }
   }
 
@@ -392,7 +398,13 @@ class TopicInfoFragmentTest {
       onView(withId(R.id.see_more_text_view)).perform(scrollTo())
       onView(withId(R.id.see_more_text_view)).perform(click())
       onView(withId(R.id.see_more_text_view)).perform(scrollTo())
-      onView(withId(R.id.see_more_text_view)).check(matches(withText(R.string.see_less)))
+      onView(withId(R.id.see_more_text_view)).check(
+        matches(
+          withText(
+            R.string.topic_fragment_info_see_less_text
+          )
+        )
+      )
     }
   }
 
@@ -405,7 +417,13 @@ class TopicInfoFragmentTest {
     ).use {
       onView(withId(R.id.see_more_text_view)).perform(scrollTo())
       onView(withId(R.id.see_more_text_view)).check(matches(isDisplayed()))
-      onView(withId(R.id.see_more_text_view)).check(matches(withText(R.string.see_more)))
+      onView(withId(R.id.see_more_text_view)).check(
+        matches(
+          withText(
+            R.string.topic_fragment_info_see_more_text
+          )
+        )
+      )
     }
   }
 
@@ -419,7 +437,13 @@ class TopicInfoFragmentTest {
       onView(withId(R.id.see_more_text_view)).perform(scrollTo())
       onView(withId(R.id.see_more_text_view)).perform(click())
       onView(withId(R.id.see_more_text_view)).perform(scrollTo())
-      onView(withId(R.id.see_more_text_view)).check(matches(withText(R.string.see_less)))
+      onView(withId(R.id.see_more_text_view)).check(
+        matches(
+          withText(
+            R.string.topic_fragment_info_see_less_text
+          )
+        )
+      )
     }
   }
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt
index 74481e48ebc..a397cd15b5c 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/practice/TopicPracticeFragmentTest.kt
@@ -176,7 +176,7 @@ class TopicPracticeFragmentTest {
       ).check(
         matches(
           withText(
-            R.string.topic_practice_master_these_skills
+            R.string.topic_fragment_practice_master_skills_text
           )
         )
       )
@@ -359,7 +359,7 @@ class TopicPracticeFragmentTest {
       ).check(
         matches(
           withText(
-            R.string.topic_practice_master_these_skills
+            R.string.topic_fragment_practice_master_skills_text
           )
         )
       )
@@ -373,7 +373,7 @@ class TopicPracticeFragmentTest {
       ).check(
         matches(
           withText(
-            R.string.topic_practice_master_these_skills
+            R.string.topic_fragment_practice_master_skills_text
           )
         )
       )
diff --git a/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt
index 0f7721cbd58..3a3c9d2d4c1 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/topic/revisioncard/RevisionCardFragmentTest.kt
@@ -297,7 +297,8 @@ class RevisionCardFragmentTest {
 
       onView(withId(R.id.action_bottom_sheet_options_menu)).perform(click())
       testCoroutineDispatchers.runCurrent()
-      onView(withText(context.getString(R.string.menu_help))).inRoot(isDialog()).perform(click())
+      onView(withText(context.getString(R.string.menu_help_text))).inRoot(isDialog())
+        .perform(click())
       testCoroutineDispatchers.runCurrent()
       intended(hasComponent(HelpActivity::class.java.name))
       intended(
@@ -324,7 +325,13 @@ class RevisionCardFragmentTest {
       onView(withId(R.id.action_bottom_sheet_options_menu)).perform(click())
       testCoroutineDispatchers.runCurrent()
 
-      onView(withText(context.getString(R.string.menu_options))).inRoot(isDialog()).perform(click())
+      onView(
+        withText(
+          context.getString(
+            R.string.menu_options_text
+          )
+        )
+      ).inRoot(isDialog()).perform(click())
       testCoroutineDispatchers.runCurrent()
 
       intended(hasComponent(OptionsActivity::class.java.name))
@@ -352,7 +359,7 @@ class RevisionCardFragmentTest {
       onView(withId(R.id.action_bottom_sheet_options_menu)).perform(click())
       testCoroutineDispatchers.runCurrent()
 
-      onView(withText(context.getString(R.string.bottom_sheet_options_menu_close)))
+      onView(withText(context.getString(R.string.exploration_activity_options_menu_close_text)))
         .inRoot(isDialog())
         .perform(click())
       testCoroutineDispatchers.runCurrent()
diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest.kt
index d4e5a2afec0..aec4f066ae9 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughActivityTest.kt
@@ -192,7 +192,7 @@ class WalkthroughActivityTest {
           withId(R.id.walkthrough_welcome_description_text_view),
           isCompletelyDisplayed()
         )
-      ).check(matches(withText(R.string.walkthrough_welcome_description)))
+      ).check(matches(withText(R.string.walkthrough_activity_welcome_description)))
     }
   }
 
diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt
index 7d86a720ab6..4371ff58837 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughTopicListFragmentTest.kt
@@ -162,7 +162,7 @@ class WalkthroughTopicListFragmentTest {
         )
       ).check(
         matches(
-          withText(R.string.what_do_you_want_to_learn)
+          withText(R.string.walkthrough_activity_topic_header_text)
         )
       )
     }
diff --git a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt
index 8af2cebfb4c..cbee4cb131c 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/walkthrough/WalkthroughWelcomeFragmentTest.kt
@@ -157,7 +157,7 @@ class WalkthroughWelcomeFragmentTest {
           withId(R.id.walkthrough_welcome_description_text_view),
           isCompletelyDisplayed()
         )
-      ).check(matches(withText(R.string.walkthrough_welcome_description)))
+      ).check(matches(withText(R.string.walkthrough_activity_welcome_description)))
     }
   }
 
diff --git a/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt b/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt
index a90c507ad4b..c5bac2b5ba4 100644
--- a/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt
+++ b/app/src/test/java/org/oppia/android/app/player/state/StateFragmentLocalTest.kt
@@ -191,23 +191,45 @@ import javax.inject.Singleton
 @LooperMode(LooperMode.Mode.PAUSED)
 @Config(application = StateFragmentLocalTest.TestApplication::class, qualifiers = "port-xxhdpi")
 class StateFragmentLocalTest {
-  @get:Rule val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
-  @get:Rule val oppiaTestRule = OppiaTestRule()
+  @get:Rule
+  val initializeDefaultLocaleRule = InitializeDefaultLocaleRule()
+
+  @get:Rule
+  val oppiaTestRule = OppiaTestRule()
 
   private val AUDIO_URL_1 =
     createAudioUrl(explorationId = "MjZzEVOG47_1", audioFileName = "content-en-ouqm7j21vt8.mp3")
   private val audioDataSource1 = DataSource.toDataSource(AUDIO_URL_1, /* headers= */ null)
 
-  @Inject lateinit var profileTestHelper: ProfileTestHelper
-  @Inject lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
-  @Inject lateinit var context: Context
-  @field:[Inject BackgroundDispatcher] lateinit var backgroundDispatcher: CoroutineDispatcher
-  @Inject lateinit var editTextInputAction: EditTextInputAction
-  @Inject lateinit var accessibilityManager: FakeAccessibilityService
-  @Inject lateinit var translationController: TranslationController
-  @Inject lateinit var monitorFactory: DataProviderTestMonitor.Factory
-  @Inject lateinit var fakeAccessibilityService: FakeAccessibilityService
-  @Inject lateinit var testGlideImageLoader: TestGlideImageLoader
+  @Inject
+  lateinit var profileTestHelper: ProfileTestHelper
+
+  @Inject
+  lateinit var testCoroutineDispatchers: TestCoroutineDispatchers
+
+  @Inject
+  lateinit var context: Context
+
+  @field:[Inject BackgroundDispatcher]
+  lateinit var backgroundDispatcher: CoroutineDispatcher
+
+  @Inject
+  lateinit var editTextInputAction: EditTextInputAction
+
+  @Inject
+  lateinit var accessibilityManager: FakeAccessibilityService
+
+  @Inject
+  lateinit var translationController: TranslationController
+
+  @Inject
+  lateinit var monitorFactory: DataProviderTestMonitor.Factory
+
+  @Inject
+  lateinit var fakeAccessibilityService: FakeAccessibilityService
+
+  @Inject
+  lateinit var testGlideImageLoader: TestGlideImageLoader
 
   private val profileId = ProfileId.newBuilder().apply { internalId = 1 }.build()
   private val solutionIndex: Int = 4
@@ -2035,7 +2057,13 @@ class StateFragmentLocalTest {
       submitFractionAnswer("1/2")
 
       onView(withId(R.id.hint_bulb))
-        .check(matches(withContentDescription(R.string.new_hint_available)))
+        .check(
+          matches(
+            withContentDescription(
+              R.string.question_player_activity_new_hint_available_text
+            )
+          )
+        )
     }
   }
 
@@ -2076,7 +2104,13 @@ class StateFragmentLocalTest {
       closeHintsAndSolutionsDialog()
 
       onView(withId(R.id.hint_bulb))
-        .check(matches(withContentDescription(R.string.no_new_hint_available)))
+        .check(
+          matches(
+            withContentDescription(
+              R.string.state_fragment_hint_bulb_content_description
+            )
+          )
+        )
     }
   }
 
@@ -2117,7 +2151,13 @@ class StateFragmentLocalTest {
       submitFractionAnswer("1/2")
 
       onView(withId(R.id.open_hint_dialog_arrow))
-        .check(matches(withContentDescription(R.string.show_hints_and_solution)))
+        .check(
+          matches(
+            withContentDescription(
+              R.string.state_fragment_open_hint_content_description
+            )
+          )
+        )
     }
   }
 
diff --git a/app/src/test/java/org/oppia/android/app/testing/CompletedStoryListSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/CompletedStoryListSpanTest.kt
index 2fda58f0898..ed69e46d63a 100644
--- a/app/src/test/java/org/oppia/android/app/testing/CompletedStoryListSpanTest.kt
+++ b/app/src/test/java/org/oppia/android/app/testing/CompletedStoryListSpanTest.kt
@@ -110,7 +110,7 @@ class CompletedStoryListSpanTest {
     val completedStoryListRecyclerVIew =
       completedStoryListFragment?.view?.findViewWithTag<RecyclerView>(
         activity.resources.getString(
-          R.string.completed_story_list_recyclerview_tag
+          R.string.completed_story_list_fragment_recyclerview_tag
         )
       )
     return (completedStoryListRecyclerVIew?.layoutManager as GridLayoutManager).spanCount
diff --git a/app/src/test/java/org/oppia/android/app/testing/OngoingTopicListSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/OngoingTopicListSpanTest.kt
index 06eafa277a4..7b6f172d301 100644
--- a/app/src/test/java/org/oppia/android/app/testing/OngoingTopicListSpanTest.kt
+++ b/app/src/test/java/org/oppia/android/app/testing/OngoingTopicListSpanTest.kt
@@ -113,7 +113,7 @@ class OngoingTopicListSpanTest {
 
   private fun getOngoingRecyclerView(activity: OngoingTopicListActivity): RecyclerView {
     return getOngoingTopicListFragment(activity).view?.findViewWithTag<View>(
-      activity.resources.getString(R.string.ongoing_recycler_view_tag)
+      activity.resources.getString(R.string.ongoing_topic_list_fragment_recycler_view_tag)
     )!! as RecyclerView
   }
 
diff --git a/app/src/test/java/org/oppia/android/app/testing/TopicRevisionSpanTest.kt b/app/src/test/java/org/oppia/android/app/testing/TopicRevisionSpanTest.kt
index 19a9bd08b35..e9f8416c887 100644
--- a/app/src/test/java/org/oppia/android/app/testing/TopicRevisionSpanTest.kt
+++ b/app/src/test/java/org/oppia/android/app/testing/TopicRevisionSpanTest.kt
@@ -107,7 +107,9 @@ class TopicRevisionSpanTest {
     val revisionFragment = activity
       .supportFragmentManager
       .findFragmentByTag(TopicRevisionFragment.TOPIC_REVISION_FRAGMENT_TAG)
-    val recyclerviewTag = activity.resources.getString(R.string.topic_revision_recyclerview_tag)
+    val recyclerviewTag = activity.resources.getString(
+      R.string.topic_fragment_revision_recyclerview_tag
+    )
     val recyclerView =
       revisionFragment?.view?.findViewWithTag<RecyclerView>(recyclerviewTag)
     return (recyclerView?.layoutManager as GridLayoutManager).spanCount
diff --git a/instrumentation/src/java/AndroidManifest.xml b/instrumentation/src/java/AndroidManifest.xml
index f28a8c6c04a..9cbfab5a5c9 100644
--- a/instrumentation/src/java/AndroidManifest.xml
+++ b/instrumentation/src/java/AndroidManifest.xml
@@ -95,7 +95,7 @@
     <activity android:name=".app.player.state.testing.StateFragmentTestActivity" />
     <activity
       android:name=".app.profile.AddProfileActivity"
-      android:label="@string/add_profile_activity_label"
+      android:label="@string/add_profile_activity_title"
       android:theme="@style/OppiaThemeWithoutActionBarColorAccentColorPrimary" />
     <activity
       android:name=".app.profile.AdminAuthActivity"
@@ -113,7 +113,7 @@
       android:windowSoftInputMode="adjustResize" />
     <activity
       android:name=".app.profile.ProfileChooserActivity"
-      android:label="@string/profile_chooser_activity_label"
+      android:label="@string/profile_chooser_activity_title"
       android:theme="@style/OppiaThemeWithoutActionBar" />
     <activity
       android:name=".app.profileprogress.ProfilePictureActivity"
@@ -192,7 +192,7 @@
     <activity android:name=".app.testing.SplashTestActivity" />
     <activity
       android:name=".app.topic.TopicActivity"
-      android:label="@string/topic_page"
+      android:label="@string/topic_activity_title"
       android:theme="@style/OppiaThemeWithoutActionBar" />
     <activity
       android:name=".app.walkthrough.WalkthroughActivity"
diff --git a/wiki/Oppia-Android-Testing.md b/wiki/Oppia-Android-Testing.md
index 757d83975bf..ddf05d94674 100644
--- a/wiki/Oppia-Android-Testing.md
+++ b/wiki/Oppia-Android-Testing.md
@@ -201,7 +201,7 @@ onView(withId(R.id.profile_edit_name)).check(matches(withText("Sean")))
 
 onView(withId(R.id.test_number_input_interaction_view)).check(matches(isDisplayed())).check(matches(withText("9")))
 
-onView(withText(R.string.home_activity_back_dialog_exit)).perform(click())
+onView(withText(R.string.home_activity_back_dialog_exit_button)).perform(click())
 onView(withId(R.id.story_chapter_list)).perform(
  scrollToPosition<RecyclerView.ViewHolder>(
    1
@@ -233,7 +233,7 @@ fun testOnboardingFragment_checkSlide1Description_isCorrect() {
               withId(R.id.slide_description_text_view),
                isCompletelyDisplayed()
              )
-        ).check(matches(withText(R.string.onboarding_slide_1_description)))
+        ).check(matches(withText(R.string.onboarding_activity_slide_1_description)))
 }
 ```
 ## Testing RecyclerViews at Specific Positions
@@ -349,9 +349,9 @@ at least 90 percent of the view's area is displayed to the user.
     ActivityScenario.launch<AdministratorControlsActivity>(createAdministratorControlsActivityIntent(0)).use {
       onView(withId(R.id.administrator_controls_list)).perform(scrollToPosition<RecyclerView.ViewHolder>(4))
       onView(withId(R.id.log_out_text_view)).perform(click())
-      onView(withText(R.string.log_out_dialog_message)).inRoot(isDialog())
+      onView(withText(R.string.log_out_dialog_message_text)).inRoot(isDialog())
         .check(matches(isDisplayed()))
-      onView(withText(R.string.log_out_dialog_okay_button)).perform(click())
+      onView(withText(R.string.log_out_dialog_okay_button_text)).perform(click())
       intended(hasComponent(ProfileActivity::class.java.name))
     }
   }
diff --git a/wiki/Spotlight-Guide.md b/wiki/Spotlight-Guide.md
index 60d4db2dff9..e073fe383c8 100644
--- a/wiki/Spotlight-Guide.md
+++ b/wiki/Spotlight-Guide.md
@@ -126,7 +126,7 @@ Spotlights are tested by checking if the expected hint is shown on the screen or
     logIntoUserTwice()
     launch<HomeActivity>(createHomeActivityIntent(internalProfileId1)).use {
       testCoroutineDispatchers.runCurrent()
-      onView(withText(R.string.promoted_story_spotlight_hint))
+      onView(withText(R.string.home_story_promoted_story_spotlight_hint))
         .check(matches(isDisplayed()))
       // Or, use check(doesNotExist()) to verify it is not being shown.
     }