diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt index de96cc1b2..6d3d6a933 100644 --- a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt +++ b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt @@ -106,13 +106,19 @@ class CustomTabsIntegration( private val menuItems by lazy { listOf( SimpleBrowserMenuItem( - context.getString(R.string.browser_menu_powered_by), + { + val appName = context.getString(R.string.app_name) + context.getString(R.string.browser_menu_powered_by, appName).toUpperCase() + }(), ToolbarMenu.CAPTION_TEXT_SIZE, DefaultThemeManager.resolveAttribute(R.attr.browserToolbarMenuIcons, context) ), BrowserMenuDivider(), SimpleBrowserMenuItem( - context.getString(R.string.browser_menu_open_in_fenix), + { + val appName = context.getString(R.string.app_name) + context.getString(R.string.browser_menu_open_in_fenix, appName) + }(), textColorResource = DefaultThemeManager.resolveAttribute( R.attr.browserToolbarMenuIcons, context diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt index 721ba8134..d44582e18 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -293,6 +293,8 @@ class HomeFragment : Fragment(), CoroutineScope { private fun setupPrivateBrowsingDescription() { // Format the description text to include a hyperlink + val appName = resources.getString(R.string.app_name) + private_session_description.text = resources.getString(R.string.private_browsing_explanation, appName) val descriptionText = String .format(private_session_description.text.toString(), System.getProperty("line.separator")) val linkStartIndex = descriptionText.indexOf("\n\n") + 2 diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt index 0e386b5e7..cf4cabeb7 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt @@ -81,6 +81,10 @@ class SettingsFragment : PreferenceFragmentCompat(), CoroutineScope, AccountObse requireComponents.search.searchEngineManager.getDefaultSearchEngine(it).name } + val aboutPreference = findPreference(getString(R.string.pref_key_about)) + val appName = getString(R.string.app_name) + aboutPreference?.title = getString(R.string.preferences_about, appName) + generateWordmark() setupPreferences() setupAccountUI() diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ebfcad4cf..349187f9b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,7 +4,8 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - GeckoView Preview + Fenix + More options @@ -16,13 +17,16 @@ Sessions help you return to the sites you visit often and those you\'ve just discovered. Start browsing and they\'ll begin to appear here. Search or enter address + You\'re in a private session - + %1$s clears your search and browsing history when you close your private session. While this doesn\'t make you anonymous to websites or your internet service provider, it makes it easier to keep what you do online private from anyone else who uses this device.\n\nCommon myths about private browsing Delete session + Home @@ -54,10 +58,13 @@ Share Share with… - + Open in %1$s - + POWERED BY %1$s + Scan @@ -65,9 +72,11 @@ Shortcuts Fill link from clipboard + Settings + Basics @@ -81,7 +90,8 @@ Rate on Google Play Give feedback - + About %1$s Passwords @@ -117,6 +127,7 @@ Show search suggestions Account settings + Optimize @@ -149,6 +160,7 @@ Notification Ask to allow + Sync now @@ -168,6 +180,7 @@ Last synced: %s Last synced: never + Telemetry @@ -177,6 +190,7 @@ Mozilla location service Fenix health report + Share @@ -190,6 +204,7 @@ Quick action sheet Quick action sheet handle + Sessions @@ -216,6 +231,7 @@

%1$s puts you in control.

%1$s is produced by Mozilla. Our mission is to foster a healthy, open Internet.
]]> + Current session @@ -246,6 +262,7 @@ %1$d sites… + Delete history @@ -264,6 +281,7 @@ Older Entering full screen mode + Sorry. %1$s can\'t get that tab back @@ -275,8 +293,10 @@ Close tab Restore tab + Session options + Share session \ No newline at end of file