diff --git a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt index 7a46695ea..c7d371156 100644 --- a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt +++ b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt @@ -56,7 +56,7 @@ class BackgroundServices( fun defaultDeviceName(context: Context): String = context.getString( - R.string.default_device_name, + R.string.default_device_name_2, context.getString(R.string.app_name), Build.MANUFACTURER, Build.MODEL diff --git a/app/src/main/java/org/mozilla/fenix/components/PrivateShortcutCreateManager.kt b/app/src/main/java/org/mozilla/fenix/components/PrivateShortcutCreateManager.kt index 67595e204..95c840e92 100644 --- a/app/src/main/java/org/mozilla/fenix/components/PrivateShortcutCreateManager.kt +++ b/app/src/main/java/org/mozilla/fenix/components/PrivateShortcutCreateManager.kt @@ -25,8 +25,18 @@ object PrivateShortcutCreateManager { val icon = IconCompat.createWithResource(context, R.mipmap.ic_launcher_private_round) val shortcut = ShortcutInfoCompat.Builder(context, UUID.randomUUID().toString()) - .setShortLabel(context.getString(R.string.app_name_private_2)) - .setLongLabel(context.getString(R.string.app_name_private_2)) + .setShortLabel( + context.getString( + R.string.app_name_private_5, + context.getString(R.string.app_name) + ) + ) + .setLongLabel( + context.getString( + R.string.app_name_private_5, + context.getString(R.string.app_name) + ) + ) .setIcon(icon) .setIntent(Intent(context, HomeActivity::class.java).apply { action = Intent.ACTION_VIEW diff --git a/app/src/main/java/org/mozilla/fenix/session/SessionNotificationService.kt b/app/src/main/java/org/mozilla/fenix/session/SessionNotificationService.kt index b4cace5d8..df91b9675 100644 --- a/app/src/main/java/org/mozilla/fenix/session/SessionNotificationService.kt +++ b/app/src/main/java/org/mozilla/fenix/session/SessionNotificationService.kt @@ -76,7 +76,7 @@ class SessionNotificationService : Service() { return NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID) .setOngoing(true) .setSmallIcon(R.drawable.ic_pbm_notification) - .setContentTitle(getString(R.string.app_name_private_3)) + .setContentTitle(getString(R.string.app_name_private_4, getString(R.string.app_name))) .setContentText(getString(R.string.notification_pbm_delete_text_2)) .setContentIntent(createNotificationIntent()) .setVisibility(NotificationCompat.VISIBILITY_SECRET) diff --git a/app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt index d1cec43a2..0e81e9f83 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt @@ -49,7 +49,12 @@ class SignOutFragment : BottomSheetDialogFragment() { savedInstanceState: Bundle? ): View? { accountManager = requireComponents.backgroundServices.accountManager - return inflater.inflate(R.layout.fragment_sign_out, container, false) + val view = inflater.inflate(R.layout.fragment_sign_out, container, false) + view.sign_out_message.text = view.context.getString( + R.string.sign_out_confirmation_message_2, + view.context.getString(R.string.app_name) + ) + return view } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { diff --git a/app/src/main/res/layout/fragment_sign_out.xml b/app/src/main/res/layout/fragment_sign_out.xml index 46ee47de0..44f34aa17 100644 --- a/app/src/main/res/layout/fragment_sign_out.xml +++ b/app/src/main/res/layout/fragment_sign_out.xml @@ -16,7 +16,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" app:drawableStartCompat="@drawable/ic_info" - android:text="@string/sign_out_confirmation_message" + android:text="@string/sign_out_confirmation_message_2" android:textSize="16sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5acb0047b..d6155802a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,10 +2,10 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - Private Firefox Preview - - Firefox Preview (Private) + + Private %s + + %s (Private) More options @@ -292,7 +292,7 @@ - %s on %s %s + %1$s on %2$s %3$s @@ -952,6 +952,8 @@ Use email instead Firefox will stop syncing with your account, but won’t delete any of your browsing data on this device. + + %s will stop syncing with your account, but won’t delete any of your browsing data on this device. Disconnect