Skip to content

Commit 5adbf32

Browse files
authored
Merge pull request #20444 from wordpress-mobile/merge/24.4-rc-2-to-trunk
Merge 24.4-rc-2 to trunk
2 parents fda7414 + e31732b commit 5adbf32

File tree

53 files changed

+3711
-6164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+3711
-6164
lines changed

RELEASE-NOTES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* [*] Block editor: Prevent crash when autoscrolling to blocks [https://github.com/WordPress/gutenberg/pull/59110]
1616
* [*] Block editor: Remove opacity change when images are being uploaded [https://github.com/WordPress/gutenberg/pull/59264]
1717
* [*] Block editor: Media & Text blocks correctly show an error message when the attached video upload fails [https://github.com/WordPress/gutenberg/pull/59288]
18+
* [*] [Jetpack-only] Themes: Filters themes that are not available due to tier to prevent activation errors. [https://github.com/wordpress-mobile/WordPress-Android/pull/20425]
1819

1920
24.3
2021
-----

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/traffic/TrafficOverviewUseCase.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ class TrafficOverviewUseCase(
9292
statsSiteProvider.siteModel,
9393
lowerGranularity,
9494
LimitMode.Top(OVERVIEW_ITEMS_TO_LOAD),
95-
it
95+
it,
96+
false
9697
)
9798
}
9899
} else {

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

Lines changed: 10 additions & 90 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
Translation-Revision-Date: 2015-12-08 01:00:08+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
5-
Generator: GlotPress/4.0.0-beta.3
5+
Generator: GlotPress/4.0.0-rc.1
66
Language: az
77
-->
88
<resources>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
Translation-Revision-Date: 2018-12-10 19:56:03+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
5-
Generator: GlotPress/4.0.0-beta.3
5+
Generator: GlotPress/4.0.0-rc.1
66
Language: bg
77
-->
88
<resources>

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

Lines changed: 2 additions & 89 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
Translation-Revision-Date: 2017-03-25 17:35:05+0000
44
Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;
5-
Generator: GlotPress/4.0.0-beta.3
5+
Generator: GlotPress/4.0.0-rc.1
66
Language: cy_GB
77
-->
88
<resources>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
Translation-Revision-Date: 2021-08-01 11:11:29+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
5-
Generator: GlotPress/4.0.0-beta.3
5+
Generator: GlotPress/4.0.0-rc.1
66
Language: da_DK
77
-->
88
<resources>

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

Lines changed: 10 additions & 91 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
Translation-Revision-Date: 2023-06-13 08:27:23+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
5-
Generator: GlotPress/4.0.0-beta.3
5+
Generator: GlotPress/4.0.0-rc.1
66
Language: el_GR
77
-->
88
<resources>
@@ -43,14 +43,10 @@ Language: el_GR
4343
<string name="gutenberg_native_error">Σφάλμα </string>
4444
<string name="gutenberg_native_choose_file">Επιλέξτε αρχείο</string>
4545
<string name="button_copy">Διπλότυπο</string>
46-
<string name="toast_edit_story_update_in_progress_title">Η ιστορία αποθηκευεται, παρακαλούμε περιμένετε…</string>
4746
<string name="gutenberg_native_file_name">Όνομα αρχείου</string>
4847
<string name="activity_log_activity_type_filter_apply">Εκτέλεση</string>
4948
<string name="activity_log_activity_type_filter_clear">Καθαρισμός</string>
5049
<string name="label_done_button">Ολοκληρώθηκε</string>
51-
<string name="dialog_discard_story_title_edit">Απόρριψη αλλαγών;</string>
52-
<string name="dialog_discard_story_ok_button_edit">Απόρριψη</string>
53-
<string name="color_picker_label_background">Φόντο</string>
5450
<string name="prepublishing_nudges_add_category_button">Προσθήκη κατηγορίας</string>
5551
<string name="prepublishing_nudges_toolbar_title_add_categories">Προσθήκη Νέας Κατηγορίας</string>
5652
<string name="prepublishing_nudges_toolbar_title_categories">Κατηγορίες</string>
@@ -59,7 +55,6 @@ Language: el_GR
5955
<string name="login_prologue_fifth_caption_three">Μουσεία στο Λονδίνο</string>
6056
<string name="gutenberg_native_help_button">Κουμπί Βοήθειας</string>
6157
<string name="gutenberg_native_choose_images">Επιλέξτε εικόνες</string>
62-
<string name="stories_intro_create_story_post_label">Δημιουργήστε μια ιστορία</string>
6358
<string name="post_signup_interstitial_not_right_now">Όχι τώρα</string>
6459
<string name="post_signup_interstitial_title">Καλώς ήρθατε στο WordPress!</string>
6560
<string name="photo_picker_image_selected">, Επιλεγμένο</string>

0 commit comments

Comments
 (0)