Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into item-listing-search-a…
Browse files Browse the repository at this point in the history
…ction-button

# Conflicts:
#	app/src/main/res/values/strings.xml
  • Loading branch information
SaintPatrck committed Apr 11, 2024
2 parents 5f44622 + 168e662 commit 573d51b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ fun ItemListingScreen(
.nestedScroll(scrollBehavior.nestedScrollConnection),
topBar = {
BitwardenTopAppBar(
title = stringResource(id = R.string.bitwarden_authenticator),
title = stringResource(id = R.string.verification_codes),
scrollBehavior = scrollBehavior,
navigationIcon = null,
actions = {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
<string name="item_saved">Item saved</string>
<string name="information">Information</string>
<string name="otp_authentication">OTP Authentication</string>
<string name="verification_codes">Verification codes</string>
<string name="there_are_no_items_that_match_the_search">There are no items that match the search</string>
<string name="back">Back</string>
<string name="clear">Clear</string>
Expand Down

0 comments on commit 573d51b

Please sign in to comment.