Update donor badge strings.

app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredBadgeBottomSheetDialogFragment.kt

@@ -41,9 +41,9 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
       sectionHeaderPref(
         DSLSettingsText.from(
           if (badge.isBoost()) {
-            R.string.ExpiredBadgeBottomSheetDialogFragment__your_badge_has_expired
+            R.string.ExpiredBadgeBottomSheetDialogFragment__boost_badge_expired
           } else {
-            R.string.ExpiredBadgeBottomSheetDialogFragment__subscription_cancelled
+            R.string.ExpiredBadgeBottomSheetDialogFragment__monthly_donation_cancelled
           },
           DSLSettingsText.CenterModifier
         )
@@ -54,11 +54,11 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
       noPadTextPref(
         DSLSettingsText.from(
           if (badge.isBoost()) {
-            getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_boost_badge_has_expired)
+            getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_boost_badge_has_expired_and)
           } else if (inactive) {
-            getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_sustainer_subscription_was_automatically, badge.name)
+            getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_automatically, badge.name)
           } else {
-            getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_sustainer_subscription_was_canceled)
+            getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_canceled)
           },
           DSLSettingsText.CenterModifier
         )
@@ -72,7 +72,7 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
             if (isLikelyASustainer) {
               R.string.ExpiredBadgeBottomSheetDialogFragment__you_can_reactivate
             } else {
-              R.string.ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting_technology
+              R.string.ExpiredBadgeBottomSheetDialogFragment__you_can_keep
             }
           } else {
             R.string.ExpiredBadgeBottomSheetDialogFragment__you_can

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt

@@ -151,7 +151,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
               if (state.hasActiveSubscription) {
                 R.string.preferences__subscription
               } else {
-                R.string.preferences__become_a_signal_sustainer
+                R.string.preferences__monthly_donation
               }
             ),
             icon = DSLSettingsIcon.from(R.drawable.ic_heart_24),
@@ -166,7 +166,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men
           )
         )
         clickPref(
-          title = DSLSettingsText.from(R.string.preferences__signal_boost),
+          title = DSLSettingsText.from(R.string.preferences__one_time_donation),
           icon = DSLSettingsIcon.from(R.drawable.ic_boost_24),
           onClick = {
             findNavController().safeNavigate(AppSettingsFragmentDirections.actionAppSettingsFragmentToBoostsFragment())

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostFragment.kt

@@ -70,7 +70,7 @@ class BoostFragment : DSLSettingsBottomSheetFragment(
   private var errorDialog: DialogInterface? = null
 
   private val sayThanks: CharSequence by lazy {
-    SpannableStringBuilder(requireContext().getString(R.string.BoostFragment__say_thanks_and_earn, 30))
+    SpannableStringBuilder(requireContext().getString(R.string.BoostFragment__make_a_one_time, 30))
       .append(" ")
       .append(
         SpanUtil.learnMore(requireContext(), ContextCompat.getColor(requireContext(), R.color.signal_accent_primary)) {
@@ -239,7 +239,7 @@ class BoostFragment : DSLSettingsBottomSheetFragment(
   }
 
   private fun onGooglePayButtonClicked() {
-    viewModel.requestTokenFromGooglePay(getString(R.string.preferences__signal_boost))
+    viewModel.requestTokenFromGooglePay(getString(R.string.preferences__one_time_donation))
   }
 
   private fun onPaymentConfirmed(boostBadge: Badge) {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeFragment.kt

@@ -52,7 +52,7 @@ class SubscribeFragment : DSLSettingsFragment(
   private val lifecycleDisposable = LifecycleDisposable()
 
   private val supportTechSummary: CharSequence by lazy {
-    SpannableStringBuilder(requireContext().getString(R.string.SubscribeFragment__support_technology_that_is_built_for_you_not))
+    SpannableStringBuilder(requireContext().getString(R.string.SubscribeFragment__make_a_recurring_monthly_donation))
       .append(" ")
       .append(
         SpanUtil.readMore(requireContext(), ContextCompat.getColor(requireContext(), R.color.signal_button_secondary_text)) {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/thanks/ThanksForYourSupportBottomSheetDialogFragment.kt

@@ -67,9 +67,9 @@ class ThanksForYourSupportBottomSheetDialogFragment : FixedRoundedCornerBottomSh
 
     if (args.badge.isBoost()) {
       if (Recipient.self().badges.any { !it.isBoost() }) {
-        subhead.setText(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_boost_badge_help_signal)
+        subhead.setText(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_boost_badge_display)
       } else {
-        subhead.text = SpannableStringBuilder(getString(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_boost_badge_help_signal))
+        subhead.text = SpannableStringBuilder(getString(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_boost_badge_display))
           .append(" ")
           .append(getString(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__you_can_also))
           .append(" ")
@@ -84,7 +84,7 @@ class ThanksForYourSupportBottomSheetDialogFragment : FixedRoundedCornerBottomSh
           )
       }
     } else {
-      subhead.text = getString(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_s_badge_help_signal, args.badge.name)
+      subhead.text = getString(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_s_badge_display, args.badge.name)
     }
 
     val otherBadges = Recipient.self().badges.filterNot { it.id == args.badge.id }

app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java

@@ -270,12 +270,12 @@ public final class Megaphones {
     return new Megaphone.Builder(Event.BECOME_A_SUSTAINER, Megaphone.Style.BASIC)
         .setTitle(R.string.BecomeASustainerMegaphone__become_a_sustainer)
         .setImage(R.drawable.ic_become_a_sustainer_megaphone)
-        .setBody(R.string.BecomeASustainerMegaphone__signal_is_powered)
+        .setBody(R.string.BecomeASustainerMegaphone__signal_is_powered_by)
-        .setActionButton(R.string.BecomeASustainerMegaphone__contribute, (megaphone, listener) -> {
+        .setActionButton(R.string.BecomeASustainerMegaphone__donate, (megaphone, listener) -> {
           listener.onMegaphoneNavigationRequested(AppSettingsActivity.subscriptions(context));
           listener.onMegaphoneCompleted(Event.BECOME_A_SUSTAINER);
         })
-        .setSecondaryButton(R.string.BecomeASustainerMegaphone__no_thanks, (megaphone, listener) -> {
+        .setSecondaryButton(R.string.BecomeASustainerMegaphone__not_now, (megaphone, listener) -> {
           listener.onMegaphoneCompleted(Event.BECOME_A_SUSTAINER);
         })
         .build();

app/src/main/res/layout/subscribe_learn_more_bottom_sheet_dialog_fragment.xml

@@ -55,7 +55,7 @@
                 android:layout_marginStart="@dimen/dsl_settings_gutter"
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="@dimen/dsl_settings_gutter"
-                android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__signal_is_a_non_profit_with_no"
+                android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__signal_is_a_nonprofit_with_no"
                 android:textAppearance="@style/Signal.Text.Body"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -68,7 +68,7 @@
                 android:layout_marginStart="@dimen/dsl_settings_gutter"
                 android:layout_marginTop="36dp"
                 android:layout_marginEnd="@dimen/dsl_settings_gutter"
-                android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__why_contribute"
+                android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__why_donate"
                 android:textAppearance="@style/TextAppearance.Signal.Title2"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -95,7 +95,7 @@
                 android:layout_marginTop="24dp"
                 android:layout_marginEnd="@dimen/dsl_settings_gutter"
                 android:paddingBottom="36dp"
-                android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__your_contribution"
+                android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__your_donation"
                 android:textAppearance="@style/Signal.Text.Body"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"

app/src/main/res/values/strings.xml

@@ -2482,9 +2482,12 @@
     <string name="preferences__help">Help</string>
     <string name="preferences__advanced">Advanced</string>
     <string name="preferences__donate_to_signal">Donate to Signal</string>
+    <!-- Preference label when someone is already a subscriber -->
     <string name="preferences__subscription">Subscription</string>
-    <string name="preferences__become_a_signal_sustainer">Become a Signal Sustainer</string>
+    <!-- Preference label for making a monthly donation to Signal -->
-    <string name="preferences__signal_boost">Signal Boost</string>
+    <string name="preferences__monthly_donation">Monthly Donation</string>
+    <!-- Preference label for making one-time donations to Signal -->
+    <string name="preferences__one_time_donation">One Time Donation</string>
     <string name="preferences__privacy">Privacy</string>
     <string name="preferences__mms_user_agent">MMS User Agent</string>
     <string name="preferences__advanced_mms_access_point_names">Manual MMS settings</string>
@@ -3884,9 +3887,10 @@
 
     <!-- BecomeASustainerMegaphone -->
     <string name="BecomeASustainerMegaphone__become_a_sustainer">Become a Sustainer</string>
-    <string name="BecomeASustainerMegaphone__signal_is_powered">Signal is powered by people like you. Contribute and receive a profile badge.</string>
+    <!-- Displayed in the Become a Sustainer megaphone -->
-    <string name="BecomeASustainerMegaphone__no_thanks">No thanks</string>
+    <string name="BecomeASustainerMegaphone__signal_is_powered_by">Signal is powered by people like you. Donate and receive a badge.</string>
-    <string name="BecomeASustainerMegaphone__contribute">Contribute</string>
+    <string name="BecomeASustainerMegaphone__not_now">Not now</string>
+    <string name="BecomeASustainerMegaphone__donate">Donate</string>
 
     <!-- KeyboardPagerFragment -->
     <string name="KeyboardPagerFragment_emoji">Emoji</string>
@@ -4094,6 +4098,7 @@
     <string name="SubscribeFragment__signal_is_powered_by_people_like_you">Signal is powered by people like you.</string>
     <string name="SubscribeFragment__support_technology_that_is_built_for_you">Support technology that is built for you—not for your data—by joining the community of people that sustain it.</string>
     <string name="SubscribeFragment__support_technology_that_is_built_for_you_not">Support technology that is built for you, not for your data, by joining the community that sustains Signal.</string>
+    <string name="SubscribeFragment__make_a_recurring_monthly_donation">Make a recurring monthly donation to Signal to support technology built for you, not your data.</string>
     <string name="SubscribeFragment__currency">Currency</string>
     <string name="SubscribeFragment__more_payment_options">More Payment Options</string>
     <string name="SubscribeFragment__cancel_subscription">Cancel Subscription</string>
@@ -4111,15 +4116,16 @@
     <string name="Subscription__s_per_month_dot_renews_s">%1$s/month · Renews %2$s</string>
     <string name="Subscription__s_per_month_dot_expires_s">%1$s/month · Expires %2$s</string>
 
-    <string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_a_non_profit_with_no">Signal is a non-profit with no advertisers or investors, sustained only by the people who use and value it. Make a recurring monthly contribution and receive a profile badge to share your support.</string>
+    <!-- First small text blurb on learn more sheet -->
-    <string name="SubscribeLearnMoreBottomSheetDialogFragment__why_contribute">Why Contribute?</string>
+    <string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_a_nonprofit_with_no">Signal is a nonprofit with no advertisers or investors, sustained only by the people who use and value it. Make a recurring monthly donation and receive a profile badge to share your support.</string>
+    <string name="SubscribeLearnMoreBottomSheetDialogFragment__why_donate">Why Donate?</string>
     <string name="SubscribeLearnMoreBottomSheetDialogFragment__signal_is_committed_to_developing">Signal is committed to developing open source privacy technology that protects free expression and enables secure global communication.</string>
-    <string name="SubscribeLearnMoreBottomSheetDialogFragment__your_contribution">Your contribution fuels this cause and pays for the development and operations of an app used by millions for private communication. No ads. No trackers. No kidding.</string>
+    <string name="SubscribeLearnMoreBottomSheetDialogFragment__your_donation">Your donation fuels this cause and pays for the development and operations of an app used by millions for private communication. No ads. No trackers. No kidding.</string>
 
     <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__thanks_for_your_support">Thanks for your Support!</string>
     <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__thanks_for_the_boost">Thanks for the Boost!</string>
-    <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_s_badge_help_signal">You\'ve earned %s badge! Help Signal build awareness by displaying this badge on your profile.</string>
+    <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_s_badge_display">You\'ve earned %s badge! Display this badge on your profile to build awareness for donating to Signal.</string>
-    <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_boost_badge_help_signal">You\'ve earned a Boost badge! Help Signal build awareness by displaying this badge on your profile.</string>
+    <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_boost_badge_display">You\'ve earned a Boost badge! Display this badge on your profile to build awareness for donating to Signal.</string>
     <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__you_can_also">You can also</string>
     <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__become_a_montly_sustainer">become a monthly Sustainer.</string>
     <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__display_on_profile">Display on Profile</string>
@@ -4139,7 +4145,8 @@
     <string name="ManageDonationsFragment__error_getting_subscription">Error getting subscription.</string>
 
     <string name="BoostFragment__give_signal_a_boost">Give Signal a Boost</string>
-    <string name="BoostFragment__say_thanks_and_earn">Say \"Thanks!\" and earn the Boost badge for %1$d days.</string>
+    <!-- Description text in boost sheet -->
+    <string name="BoostFragment__make_a_one_time">Make a one time donation and earn a Boost badge for %1$d days.</string>
 
     <string name="Boost__enter_custom_amount">Enter Custom Amount</string>
     <string name="Boost__one_time_contribution">One-time contribution</string>
@@ -4152,19 +4159,22 @@
     <string name="MySupportPreference__couldnt_add_badge_s">Couldn\'t add badge. %1$s</string>
     <string name="MySupportPreference__please_contact_support">Please contact support.</string>
 
-    <string name="ExpiredBadgeBottomSheetDialogFragment__your_badge_has_expired">Your Badge has Expired</string>
+    <!-- Title of expiry sheet when boost badge falls off profile unexpectedly. -->
-    <string name="ExpiredBadgeBottomSheetDialogFragment__badge_expired">Badge expired</string>
+    <string name="ExpiredBadgeBottomSheetDialogFragment__boost_badge_expired">Boost Badge Expired</string>
-    <string name="ExpiredBadgeBottomSheetDialogFragment__subscription_cancelled">Subscription cancelled</string>
+    <!-- Displayed in the bottom sheet if a monthly donation badge unexpectedly falls off the user's profile -->
-    <string name="ExpiredBadgeBottomSheetDialogFragment__your_boost_badge_has_expired">Your Boost badge has expired and is no longer visible to others on your profile.</string>
+    <string name="ExpiredBadgeBottomSheetDialogFragment__monthly_donation_cancelled">Monthly Donation Cancelled</string>
+    <!-- Displayed in the bottom sheet when a boost badge expires -->
+    <string name="ExpiredBadgeBottomSheetDialogFragment__your_boost_badge_has_expired_and">Your Boost badge has expired and is no longer visible on your profile.</string>
     <string name="ExpiredBadgeBottomSheetDialogFragment__you_can_reactivate">You can reactivate your Boost badge for another 30 days with a one-time contribution.</string>
-    <string name="ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting_technology">To continue supporting technology that is built for you, please consider becoming a monthly Sustainer.</string>
+    <!-- Displayed when we do not think the user is a subscriber when their boost expires -->
+    <string name="ExpiredBadgeBottomSheetDialogFragment__you_can_keep">You can keep using Signal but to support technology that is built for you, consider becoming a sustainer by making a monthly donation.</string>
     <string name="ExpiredBadgeBottomSheetDialogFragment__become_a_sustainer">Become a Sustainer</string>
     <string name="ExpiredBadgeBottomSheetDialogFragment__add_a_boost">Add a Boost</string>
     <string name="ExpiredBadgeBottomSheetDialogFragment__not_now">Not now</string>
     <!-- Copy displayed when badge expires after user inactivity -->
-    <string name="ExpiredBadgeBottomSheetDialogFragment__your_sustainer_subscription_was_automatically">Your Sustainer subscription was automatically cancelled because you were inactive for too long. Your %1$s badge is no longer visible on your profile.</string>
+    <string name="ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_automatically">Your recurring monthly donation was automatically cancelled because you were inactive for too long. Your %1$s badge is no longer visible on your profile.</string>
     <!-- Copy displayed when badge expires after payment failure -->
-    <string name="ExpiredBadgeBottomSheetDialogFragment__your_sustainer_subscription_was_canceled">Your Sustainer subscription was cancelled because we couldn\'t process your payment. Your badge is no longer visible on your profile.</string>
+    <string name="ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_canceled">Your recurring monthly donation was cancelled because we couldn\'t process your payment. Your badge is no longer visible on your profile.</string>
     <string name="ExpiredBadgeBottomSheetDialogFragment__you_can">You can keep using Signal but to support the app and reactivate your badge, renew now.</string>
     <string name="ExpiredBadgeBottomSheetDialogFragment__renew_subscription">Renew subscription</string>