Merge pull request #20727 from wordpress-mobile/merge/24.8-code-freez…

…e-into-trunk

Merge 24.8 code freeze into trunk

RELEASE-NOTES.txt

@@ -1,5 +1,9 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+24.9
+-----
+
+
 24.8
 -----
 * [*] [Jetpack-only] Fixed percentage numbers direction on Stats for RTL languages [https://github.com/wordpress-mobile/WordPress-Android/pull/20656]

WordPress/jetpack_metadata/release_notes.txt

@@ -1,2 +1,2 @@
-We redesigned the site picker screen. You can now pin your favorite sites, see recently accessed sites, and more. We also removed the ability to show and hide sites.
-(Did we say the word “sites” enough? We think so.)
+* [*] [Jetpack-only] Fixed percentage numbers direction on Stats for RTL languages [https://github.com/wordpress-mobile/WordPress-Android/pull/20656]
+

WordPress/metadata/release_notes.txt

@@ -1,2 +1 @@
-We redesigned the site picker screen. You can now pin your favorite sites, see recently accessed sites, and more. We also removed the ability to show and hide sites.
-(Did we say the word “sites” enough? We think so.)
+

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

@@ -4862,4 +4862,5 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
     <string name="gutenberg_native_the_editor_has_encountered_an_unexpected_error" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">The editor has encountered an unexpected error</string>
     <string name="gutenberg_native_you_can_copy_your_post_text_in_case_your_content_is_impacted_copy" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">You can copy your post text in case your content is impacted. Copy error details to debug and share with support.</string>
     <string name="gutenberg_native_clear_selected_color" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Clear selected color</string>
+    <string name="gutenberg_native_link_label" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Link label</string>
 </resources>

build.gradle

@@ -25,7 +25,7 @@ ext {
     automatticTracksVersion = '4.0.2'
     gutenbergMobileVersion = 'v1.118.0'
     wordPressAztecVersion = 'v2.1.2'
-    wordPressFluxCVersion = 'trunk-c237f715b11e3005c841c43b94623d7ef92720a0'
+    wordPressFluxCVersion = '2.77.0'
     wordPressLoginVersion = '1.15.0'
     wordPressPersistentEditTextVersion = '1.0.2'
     wordPressUtilsVersion = '3.14.0'

fastlane/resources/values/strings.xml

@@ -1299,10 +1299,6 @@
     <string name="stats_timeframe_weeks">Weeks</string>
     <string name="stats_timeframe_months">Months</string>
     <string name="stats_timeframe_years">Years</string>
-    <string name="stats_timeframe_by_day">By day</string>
-    <string name="stats_timeframe_by_week">By week</string>
-    <string name="stats_timeframe_by_month">By month</string>
-    <string name="stats_timeframe_by_year">By year</string>
     <string name="stats_timeframe_last_seven_days">Last 7-days</string>
     <string name="stats_timeframe_previous_seven_days">Previous 7-days</string>
     <string name="stats_views">Views</string>
@@ -1328,6 +1324,7 @@
     <string name="stats_view_total_followers">Total Followers</string>
 
     <!-- stats: followers -->
+    <string name="stats_subscribers_subscribers">Subscribers</string>
     <string name="stats_followers_seconds_ago">seconds ago</string>
     <string name="stats_followers_a_minute_ago">a minute ago</string>
     <string name="stats_followers_minutes">%1$d minutes</string>
@@ -1358,6 +1355,7 @@
     <!-- Stats insights -->
     <string name="stats_traffic">Traffic</string>
     <string name="stats_insights">Insights</string>
+    <string name="stats_subscribers">Subscribers</string>
     <string name="stats_insights_all_time">All-time posts, views, and visitors</string>
     <string name="stats_insights_today">Today\'s Stats</string>
     <string name="stats_insights_views_and_visitors">Views &amp; Visitors</string>
@@ -1759,6 +1757,8 @@
     <string name="editor_uploading_draft">Your draft is uploading</string>
     <string name="editor_post_converted_back_to_draft">Post converted back to draft</string>
     <string name="editor_failed_to_insert_media_tap_to_retry">Failed to insert media.\nPlease tap to retry.</string>
+    <string name="editor_updating_content">Updating content</string>
+    <string name="editor_updating_content_failed">Failed to update content</string>
 
     <!-- Post Settings -->
     <string name="post_settings">Post settings</string>
@@ -1982,6 +1982,8 @@
     <string name="local_post_autosave_revision_available">You\'ve made unsaved changes to this post</string>
     <string name="local_page_is_conflicted" translatable="false">@string/local_post_is_conflicted</string>
     <string name="local_page_autosave_revision_available">You\'ve made unsaved changes to this page</string>
+    <string name="page_upload_conflict_error">There is a revision of this page that is more recent</string>
+
 
     <!-- Post Remote Preview -->
     <string name="post_preview_saving_draft">Saving…</string>
@@ -4860,4 +4862,5 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
     <string name="gutenberg_native_the_editor_has_encountered_an_unexpected_error" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">The editor has encountered an unexpected error</string>
     <string name="gutenberg_native_you_can_copy_your_post_text_in_case_your_content_is_impacted_copy" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">You can copy your post text in case your content is impacted. Copy error details to debug and share with support.</string>
     <string name="gutenberg_native_clear_selected_color" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Clear selected color</string>
+    <string name="gutenberg_native_link_label" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Link label</string>
 </resources>

version.properties

@@ -1,2 +1,2 @@
-versionName=24.7
-versionCode=1426
+versionName=24.8-rc-1
+versionCode=1427