Merge pull request #1651 from Automattic/merge/2.32-rc-1-into-trunk

Merge 2.32-rc-1 into trunk

Author: spencertransier

RELEASE-NOTES.txt

@@ -1,3 +1,7 @@
+2.33
+-----
+
+
 2.32
 -----
 

Simplenote/build.gradle

@@ -33,9 +33,9 @@ android {
         if (project.hasProperty("versionName")) {
             versionName project.property("versionName")
         } else {
-            versionName "2.31"
+            versionName "2.32-rc-1"
         }
-        versionCode 164
+        versionCode 165
         minSdkVersion 23
         targetSdkVersion 34
 

Simplenote/metadata/PlayStoreStrings.pot

@@ -11,19 +11,20 @@ msgstr ""
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
+msgctxt "release_note_0232"
+msgid ""
+"2.32:\n"
+"• Added adaptive app icon\n"
+"• Removed Sustainer plan information and upgrade UI\n"
+msgstr ""
+
 msgctxt "release_note_0231"
 msgid ""
 "2.31:\n"
 "* Fixed the app from becoming unresponsive at launch with a large amount of notes.\n"
 "\n"
 msgstr ""
 
-msgctxt "release_note_0230"
-msgid ""
-"2.30:\n"
-"• Fixed a crash when syncing large notes\n"
-msgstr ""
-
 #. translators: Short description of the app to be displayed in the Play Store. Limit to 80 characters including spaces and commas!
 msgctxt "play_store_promo"
 msgid "Take notes, create to-do lists, capture ideas, and more."

Simplenote/metadata/release_notes.txt

@@ -1,2 +1,2 @@
-* Fixed the app from becoming unresponsive at launch with a large amount of notes.
-
+• Added adaptive app icon
+• Removed Sustainer plan information and upgrade UI

fastlane/resources/values/strings.xml

@@ -123,6 +123,7 @@
     <string name="detect_links">Detect links</string>
     <string name="share_analytics">Share analytics</string>
     <string name="share_analytics_summary">Help us improve Simplenote by sharing usage data with our analytics tool. %1$sLearn more%2$s</string>
+    <string name="sustainer_app_icon">Sustainer app icon</string>
 
     <!-- Tags -->
     <string name="add_tag">Add Tag</string>
@@ -347,22 +348,6 @@
     <string name="collaborators_note_trashed">Note was trashed. You cannot edit collaborators on a note that is in the trash.</string>
     <string name="no_collaborators">No Collaborators</string>
 
-    <!-- IAP -->
-    <string name="iap_banner_title">Become a Simplenote Sustainer</string>
-    <string name="iap_banner_subtitle">Support your favorite notes app and help unlock future features.</string>
-    <string name="iap_thank_you_banner_title">You are a Simplenote Sustainer</string>
-    <string name="iap_thank_you_banner_subtitle">Thank you for your continued support</string>
-    <string name="subscription_weekly">Weekly</string>
-    <string name="subscription_monthly">Monthly</string>
-    <string name="subscription_three_month">Three Month</string>
-    <string name="subscription_six_month">Six Month</string>
-    <string name="subscription_yearly_month">Yearly</string>
-    <string name="subscription_unknown">Unknown Length</string>
-    <string name="subscription_choose_plan">Choose a plan</string>
-    <string name="subscription_purchase_success">Purchase successful. Thank you for your continued support!</string>
-    <string name="subscription_purchase_error">Purchase failed</string>
-    <string name="subscription_plans_fetching_error">Error fetching plans. Please, check your connection and try again.</string>
-
     <!-- PASSCODE -->
     <string name="passcode_change_passcode">Change passcode</string>
     <string name="passcode_enter_old_passcode">Enter your old passcode</string>