Skip to content

Commit a5d90e5

Browse files
authored
Merge pull request #19669 from wordpress-mobile/release/23.7
Merge 23.7 final to trunk
2 parents ae07b49 + 3dbc692 commit a5d90e5

75 files changed

Lines changed: 400 additions & 141 deletions

File tree

Some content is hidden

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

WordPress/src/main/java/org/wordpress/android/ui/posts/PostListItemViewHolder.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package org.wordpress.android.ui.posts
22

33
import android.content.Context
44
import android.graphics.drawable.Drawable
5+
import android.text.Layout
56
import android.text.Spannable
67
import android.text.SpannableString
78
import android.text.style.ForegroundColorSpan
@@ -130,10 +131,10 @@ sealed class PostListItemViewHolder(
130131
titleTextView.viewTreeObserver.removeOnPreDrawListener(this)
131132

132133
// Get the layout of the title text
133-
val titleLayout = titleTextView.layout
134+
val titleLayout: Layout? = titleTextView.layout
134135

135136
// Check if the title occupies more than 2 lines
136-
when (titleLayout.lineCount) {
137+
when (titleLayout?.lineCount) {
137138
1 -> {
138139
excerptTextView.maxLines = 2
139140
}

WordPress/src/main/res/values-en-rGB/strings.xml

Lines changed: 195 additions & 1 deletion
Large diffs are not rendered by default.

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

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,30 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2023-11-01 13:54:08+0000
3+
Translation-Revision-Date: 2023-11-23 14:54:10+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
55
Generator: GlotPress/4.0.0-alpha.11
66
Language: he_IL
77
-->
88
<resources>
9+
<string name="notification_security_key_needed">כדי להמשיך עליך לספק מפתח אבטחה.</string>
10+
<string name="login_error_security_key">בעיה בהתחברות בעזרת מפתח האבטחה</string>
11+
<string name="login_text_security_key">להשתמש במפתח אבטחה</string>
12+
<string name="new_domain_search_screen_error_title">לא ניתן לאחזר דומיינים</string>
13+
<string name="new_domain_search_screen_list_item_sale_price">%s בשנה הראשונה</string>
14+
<string name="new_domain_search_screen_list_item_regular_price">%s לשנה</string>
15+
<string name="new_domain_search_screen_transfer_domain_button">להעביר דומיין</string>
16+
<string name="new_domain_search_screen_transfer_domain_description">מעניין אותך להעביר דומיין שכבר בבעלותך?</string>
17+
<string name="new_domain_search_screen_input_placeholder">יש להקליד כדי לקבל הצעות נוספות</string>
18+
<string name="new_domain_search_screen_title">לחפש דומיין</string>
19+
<string name="purchase_domain_screen_error_button_title">אישור</string>
20+
<string name="purchase_domain_screen_error_subtitle">אופס, משהו השתבש בעת הוספת הדומיין לעגלת הקניות. יש לוודא חיבור פעיל לאינטרנט ולנסות שוב.</string>
21+
<string name="purchase_domain_screen_error_title">שגיאה</string>
22+
<string name="domain_management_site_domains_button">הכל</string>
23+
<string name="domain_management_error_title">לא ניתן לאחזר את הדומיינים שלך</string>
24+
<string name="site_domain_title">דומיין האתר</string>
25+
<string name="my_site_blogging_prompt_card_attribution_bloganuary">מ-&lt;b&gt;Bloganuary&lt;/b&gt;</string>
26+
<string name="post_status_post_edited">ערוך</string>
27+
<string name="post_list_toggle_author_filter">לסנן לפי מחבר</string>
928
<string name="gutenberg_native_s_block_converted_to_blocks">הבלוק \'%s\' בהמרה לבלוקים</string>
1029
<string name="gutenberg_native_alternatively_you_can_convert_the_content_to_blocks">לחלופין, אפשר להמיר את התוכן לבלוקים.</string>
1130
<string name="personalization_screen_shortcuts_add_or_remove_shortcut_button">להוסיף או להסיר קיצורים</string>
@@ -27,9 +46,11 @@ Language: he_IL
2746
<string name="domain_management_empty_find_domain">למצוא דומיין</string>
2847
<string name="domain_management_empty_subtitle">לאיתור הדומיין המושלם יש להקיש למטה.</string>
2948
<string name="domain_management_empty_title">עדיין אין לך דומיינים</string>
49+
<string name="domain_management_error_subtitle">יש לוודא חיבור פעיל אינטרנט ולרענן את העמוד.</string>
3050
<string name="domain_management_open_domain_details">להציג פרטי דומיין</string>
3151
<string name="domain_management_search_your_domains">לחפש בדומיינים שלך</string>
3252
<string name="domain_management_purchase_a_domain">לרכוש דומיין</string>
53+
<string name="domain_management_my_domains_title">כל הדומיינים</string>
3354
<string name="domain_management_expires">בתוקף עד ⁦%1$s⁩</string>
3455
<string name="account_and_settings">חשבון והגדרות</string>
3556
<string name="site_creation_plans_selection_title">לבחור תוכנית</string>
@@ -1614,6 +1635,7 @@ Language: he_IL
16141635
<string name="ccpa_privacy_notice_header">הצהרת פרטיות למשתמשים מקליפורניה</string>
16151636
<string name="status_and_visibility">מצב וניראות</string>
16161637
<string name="update_now">לעדכן עכשיו</string>
1638+
<string name="pages_item_subtitle">%1$s ·</string>
16171639
<string name="gutenberg_native_open_block_actions_menu">לפתוח את התפריט של פעולות הבלוק</string>
16181640
<string name="gutenberg_native_move_to_top">להעביר לחלק העליון</string>
16191641
<string name="gutenberg_native_insert_mention">להוסיף אזכור</string>
@@ -2850,6 +2872,7 @@ Language: he_IL
28502872
<string name="password_incorrect">נראה שהסיסמה הזו שגויה. יש לבדוק את המידע שהזנת ולנסות שוב.</string>
28512873
<string name="requesting_otp">שולח קוד אימות באמצעות SMS.</string>
28522874
<string name="login_text_otp">שליחת קוד במקום</string>
2875+
<string name="enter_verification_code">כמעט סיימת! יש להזין את קוד האימות עבור WordPress.com מאפליקציית האימות.</string>
28532876
<string name="open_mail">לפתוח את הדואר</string>
28542877
<string name="next">הבא</string>
28552878
<string name="enter_email_wordpress_com">התחברות ל-WordPress.com באמצעות כתובת אימייל כדי לנהל את האתרים שלך ב-WordPress.</string>

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

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2023-11-02 13:54:08+0000
3+
Translation-Revision-Date: 2023-11-23 16:54:10+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
55
Generator: GlotPress/4.0.0-alpha.11
66
Language: nl
77
-->
88
<resources>
9+
<string name="notification_security_key_needed">Voer je beveiligingssleutel in om door te gaan.</string>
10+
<string name="login_error_security_key">Er heeft zich een probleem met de aanmelding via de beveiligingssleutel voorgedaan.</string>
11+
<string name="login_text_security_key">Een beveiligingssleutel gebruiken</string>
12+
<string name="new_domain_search_screen_error_title">De domeinen konden niet worden opgehaald</string>
13+
<string name="new_domain_search_screen_list_item_regular_price">%s per jaar</string>
14+
<string name="new_domain_search_screen_transfer_domain_description">Wil je een domein overdragen dat je al bezit?</string>
15+
<string name="new_domain_search_screen_title">Een domein zoeken</string>
16+
<string name="purchase_domain_screen_error_subtitle">Er is iets misgegaan toen we het domein aan je winkelwagen wilden toevoegen. Zorg ervoor dat je online bent en probeer het opnieuw.</string>
17+
<string name="domain_management_error_title">Je domeinen konden niet worden opgehaald</string>
18+
<string name="site_domain_title">Sitedomein</string>
19+
<string name="my_site_blogging_prompt_card_attribution_bloganuary">Van &lt;b&gt;BIoganuary&lt;/b&gt;</string>
920
<string name="gutenberg_native_alternatively_you_can_convert_the_content_to_blocks">Je kan ook de inhoud naar blokken omzetten.</string>
1021
<string name="purchase_domain_screen_discount_notice">*Bij alle betaalde jaarabonnementen is een gratis domein voor een jaar inbegrepen.</string>
1122
<string name="purchase_domain_screen_existing_domain_card_button">Site kiezen</string>
@@ -20,9 +31,11 @@ Language: nl
2031
<string name="domain_management_empty_find_domain">Een domein vinden</string>
2132
<string name="domain_management_empty_subtitle">Tik hieronder om jouw ideale domein te vinden.</string>
2233
<string name="domain_management_empty_title">Je hebt nog geen domeinen</string>
34+
<string name="domain_management_error_subtitle">Controleer of je online bent en vernieuw de pagina.</string>
2335
<string name="domain_management_open_domain_details">Domeingegevens openen</string>
2436
<string name="domain_management_search_your_domains">Je domeinen zoeken</string>
2537
<string name="domain_management_purchase_a_domain">Een domein kopen</string>
38+
<string name="domain_management_my_domains_title">Alle domeinen</string>
2639
<string name="domain_management_expires">Verloopt op %1$s</string>
2740
<string name="site_creation_domain_free_with_annual_plan">Het eerste jaar gratis bij elk betaald abonnement</string>
2841
<string name="gutenberg_native_ungroup_block">Groeperen blok ongedaan maken</string>
@@ -1573,6 +1586,7 @@ Language: nl
15731586
<string name="ccpa_privacy_notice_header">Privacybericht voor gebruikers in Californie</string>
15741587
<string name="status_and_visibility">Status &amp; zichtbaarheid</string>
15751588
<string name="update_now">Update nu</string>
1589+
<string name="pages_item_subtitle">%1$s ·</string>
15761590
<string name="gutenberg_native_open_block_actions_menu">Open menu met blokacties</string>
15771591
<string name="gutenberg_native_move_to_top">Verplaats naar boven</string>
15781592
<string name="gutenberg_native_insert_mention">Voeg vermelding in</string>
@@ -2810,6 +2824,7 @@ Language: nl
28102824
<string name="password_incorrect">Het lijkt erop alsof dit wachtwoord onjuist is. Controleer je gegevens en probeer het nogmaals.</string>
28112825
<string name="requesting_otp">Verificatiecode via sms aanvragen.</string>
28122826
<string name="login_text_otp">Sms mij een code in plaats daarvan</string>
2827+
<string name="enter_verification_code">Bijna klaar! Voer de verificatiecode voor WordPress.com uit je Authenticator-app in.</string>
28132828
<string name="open_mail">Open e-mail</string>
28142829
<string name="next">Volgende</string>
28152830
<string name="enter_email_wordpress_com">Log in op WordPress.com met behulp van een e-mailadres om al je WordPress-sites te beheren.</string>

fastlane/jetpack_metadata/android/ar/changelogs/1382.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
23.7:
2+
- تتيح لك شاشة كل النطاقات إدارة كل نطاقاتك في التطبيق.
3+
- حسَّنت التدوينات والصفحات خيارات العرض وقائمة السياق الموسعة.
4+
- أصلحنا مشكلات في محرر المكوّنات ناتجة عن لصق محتوى متداخل بشدة أو استخدام ألوان النص في قوالب الموقع القديمة.

fastlane/jetpack_metadata/android/de-DE/changelogs/1382.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
23.7:
2+
- Im Bildschirm „Alle Domains“ kannst du alle deine Domains in der App verwalten.
3+
- „Beiträge & Seiten“ verfügt jetzt über verbesserte Anzeigeoptionen und ein erweitertes Kontextmenü.
4+
- Wir haben Probleme mit dem Block-Editor behoben, die durch das Einfügen tief verschachtelter Inhalte oder dem Verwenden von Textfarben in älteren Website-Themes entstanden sind.

fastlane/jetpack_metadata/android/en-US/changelogs/1382.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
- The All Domains screen lets you manage all your domains in the app.
2+
- Posts & Pages has improved display options and an expanded context menu.
3+
- We fixed block editor issues caused by pasting deeply nested content, or using text colors in older site themes.

0 commit comments

Comments
 (0)