From fd37440f1a85b28550cd9b2d76b17d6a26538e7a Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Wed, 31 Mar 2021 11:42:42 -0400
Subject: [PATCH] For #18729 - Use consistent string naming for generic strings

---
 .../fenix/components/toolbar/DefaultToolbarMenu.kt        | 4 ++--
 app/src/main/res/values/strings.xml                       | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

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 109f12105db6..f9774464802e 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
@@ -497,8 +497,8 @@ class DefaultToolbarMenu(
             primaryStateIconResource = R.drawable.ic_bookmark_outline,
             secondaryStateIconResource = R.drawable.ic_bookmark_filled,
             tintColorResource = accentBrightTextColor(),
-            primaryLabel = context.getString(R.string.add_label),
-            secondaryLabel = context.getString(R.string.edit_label),
+            primaryLabel = context.getString(R.string.add),
+            secondaryLabel = context.getString(R.string.edit),
             isInPrimaryState = { !isCurrentUrlBookmarked }
         ) {
             handleBookmarkItemTapped()
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 833d0e24a02e..28b487d434ca 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,9 +8,9 @@
     <!-- A 'Save' string to be used for labeling UI elements. -->
     <string name="save">Save</string>
     <!-- An 'Add' string to be used for labeling UI elements. -->
-    <string name="add_label">Add</string>
-    <!-- A 'Edit' string to be used for labeling UI elements. -->
-    <string name="edit_label">Edit</string>
+    <string name="add">Add</string>
+    <!-- An 'Edit' string to be used for labeling UI elements. -->
+    <string name="edit">Edit</string>
 
     <!-- App name for private browsing mode. The first parameter is the name of the app defined in app_name (for example: Fenix)-->
     <string name="app_name_private_5">Private %s</string>
@@ -1644,8 +1644,6 @@
     <string name="save_changes_to_login">Save changes to login.</string>
     <!--  The button description to discard changes to an edited login. -->
     <string name="discard_changes">Discard changes</string>
-    <!--  The page title for editing a saved login. -->
-    <string name="edit">Edit</string>
     <!--  The error message in edit login view when password field is blank. -->
     <string name="saved_login_password_required">Password required</string>
     <!-- Voice search button content description  -->