diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt
index 4e43377e2..c86c69db1 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt
@@ -97,7 +97,7 @@ class ThreeDotMenuMainRobot {
}
fun openLibrary(interact: LibraryRobot.() -> Unit): LibraryRobot.Transition {
- mDevice.waitNotNull(Until.findObject(By.text("Your Library")), waitingTime)
+ mDevice.waitNotNull(Until.findObject(By.text("Library")), waitingTime)
libraryButton().click()
LibraryRobot().interact()
@@ -253,7 +253,7 @@ private fun assertSettingsButton() = settingsButton()
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
.check(matches(isCompletelyDisplayed()))
-private fun libraryButton() = onView(allOf(withText(R.string.browser_menu_your_library)))
+private fun libraryButton() = onView(allOf(withText(R.string.browser_menu_library)))
private fun assertLibraryButton() = libraryButton()
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
@@ -299,7 +299,7 @@ private fun assertShareButton() = shareButton()
private fun browserViewSaveCollectionButton() = onView(
allOf(
- withText("Save to Collection"),
+ withText("Save to collection"),
withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)
)
)
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
index d16f429e1..df02623d7 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
@@ -194,7 +194,7 @@ class DefaultToolbarMenu(
}
private val addons = BrowserMenuImageText(
- label = context.getString(R.string.browser_menu_addon_manager),
+ label = context.getString(R.string.browser_menu_add_ons),
imageResource = R.drawable.mozac_ic_extensions,
iconTintColorResource = primaryTextColor()
) {
@@ -220,7 +220,7 @@ class DefaultToolbarMenu(
}
private val library = BrowserMenuImageText(
- label = context.getString(R.string.browser_menu_your_library),
+ label = context.getString(R.string.browser_menu_library),
imageResource = R.drawable.ic_library,
iconTintColorResource = primaryTextColor()
) {
@@ -280,7 +280,7 @@ class DefaultToolbarMenu(
}
private val saveToCollection = BrowserMenuImageText(
- label = context.getString(R.string.browser_menu_save_to_collection),
+ label = context.getString(R.string.browser_menu_save_to_collection_2),
imageResource = R.drawable.ic_tab_collection,
iconTintColorResource = primaryTextColor()
) {
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
index e41dad3ec..9e6e2b3c3 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
@@ -116,7 +116,7 @@ class HomeMenu(
whatsNewItem,
BrowserMenuDivider(),
BrowserMenuCategory(
- context.getString(R.string.browser_menu_your_library),
+ context.getString(R.string.browser_menu_library),
textColorResource = menuCategoryTextColor
),
bookmarksItem,
diff --git a/app/src/main/java/org/mozilla/fenix/library/LibraryListItem.kt b/app/src/main/java/org/mozilla/fenix/library/LibraryListItem.kt
index f0053e0f7..aa2f429f9 100644
--- a/app/src/main/java/org/mozilla/fenix/library/LibraryListItem.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/LibraryListItem.kt
@@ -9,7 +9,8 @@ import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.content.withStyledAttributes
-import kotlinx.android.synthetic.main.library_list_item.view.*
+import kotlinx.android.synthetic.main.library_list_item.view.libraryIcon
+import kotlinx.android.synthetic.main.library_list_item.view.libraryItemTitle
import org.mozilla.fenix.R
class LibraryListItem @JvmOverloads constructor(
@@ -29,7 +30,7 @@ class LibraryListItem @JvmOverloads constructor(
libraryItemTitle?.text = resources.getString(
getResourceId(
R.styleable.LibraryListItem_listItemTitle,
- R.string.browser_menu_your_library
+ R.string.browser_menu_library
)
)
}
diff --git a/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataItem.kt b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataItem.kt
index 47188ee0c..64f772628 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataItem.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteBrowsingDataItem.kt
@@ -11,7 +11,9 @@ import android.view.View
import android.widget.TextView
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.content.withStyledAttributes
-import kotlinx.android.synthetic.main.delete_browsing_data_item.view.*
+import kotlinx.android.synthetic.main.delete_browsing_data_item.view.checkbox
+import kotlinx.android.synthetic.main.delete_browsing_data_item.view.subtitle
+import kotlinx.android.synthetic.main.delete_browsing_data_item.view.title
import org.mozilla.fenix.R
class DeleteBrowsingDataItem @JvmOverloads constructor(
@@ -51,7 +53,7 @@ class DeleteBrowsingDataItem @JvmOverloads constructor(
context.withStyledAttributes(attrs, R.styleable.DeleteBrowsingDataItem, defStyleAttr, 0) {
val titleId = getResourceId(
R.styleable.DeleteBrowsingDataItem_deleteBrowsingDataItemTitle,
- R.string.browser_menu_your_library
+ R.string.browser_menu_library
)
val subtitleId = getResourceId(
R.styleable.DeleteBrowsingDataItem_deleteBrowsingDataItemSubtitle,
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index afbe9774d..82a6129ee 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -65,7 +65,7 @@
Edit bookmark
- Add-ons Manager
+ Add-ons
No add-ons here
@@ -75,7 +75,7 @@
Settings
- Your Library
+ Library
Desktop site
@@ -89,7 +89,7 @@
New tab
- Save to Collection
+ Save to collection
Report site issue