Skip to content

Commit 944f5ff

Browse files
AliSoftwareAliSoftware
authored
Merge pull request #17482 from wordpress-mobile/release/21.2
Merge release/21.2 after 21.2-rc-2
2 parents efee6b8 + c3d9346 commit 944f5ff

File tree

22 files changed

+2513
-2372
lines changed

22 files changed

+2513
-2372
lines changed

‎WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadStarter.kt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,13 @@ class UploadStarter @Inject constructor(
178178
)
179179
}
180180
} finally {
181-
mutex.unlock()
181+
// If the job of the current coroutine is cancelled while the `lock()` call is suspended,
182+
// it results in the mutex ending up unlocked.
183+
// We introduced this check to prevent IllegalStateExceptions when `unlock` is called in those cases.
184+
// See: https://github.com/wordpress-mobile/WordPress-Android/issues/17463
185+
if (mutex.isLocked) {
186+
mutex.unlock()
187+
}
182188
}
183189
}
184190

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2022-11-02 16:54:10+0000
3+
Translation-Revision-Date: 2022-11-16 16:54:09+0000
44
Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ((n == 1) ? 1 : ((n == 2) ? 2 : ((n % 100 >= 3 && n % 100 <= 10) ? 3 : ((n % 100 >= 11 && n % 100 <= 99) ? 4 : 5))));
55
Generator: GlotPress/4.0.0-alpha.3
66
Language: ar
77
-->
88
<resources>
9+
<string name="jp_migration_help_button">هل تحتاج إلى مساعدة؟</string>
10+
<string name="jp_migration_continue_button">متابعة</string>
11+
<string name="jp_migration_welcome_site_found_message">عثرنا على موقعك. استمر في نقل جميع البيانات وسجّل الدخول إلى Jetpack تلقائيًا.</string>
12+
<string name="jp_migration_welcome_sites_found_message">عثرنا على موقعك. استمر في نقل جميع البيانات وسجّل الدخول إلى Jetpack تلقائيًا.</string>
13+
<string name="jp_migration_avatar_content_description">صورة ملفك الشخصي</string>
14+
<string name="jp_migration_welcome_subtitle">يبدو أنك ستقوم بالتبديل من تطبيق ووربريس.</string>
15+
<string name="jp_migration_welcome_title">مرحبًا بك في Jetpack!</string>
16+
<string name="icon_desc">أيقونة</string>
917
<string name="post_settings_parent">الصفحة الأصل</string>
1018
<string name="post_settings_page_attributes">خصائص الصفحة</string>
1119
<string name="about_automattic_contribute_item_title">مساهمة</string>

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2022-11-02 13:54:09+0000
3+
Translation-Revision-Date: 2022-11-16 13:54:10+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
55
Generator: GlotPress/4.0.0-alpha.3
66
Language: de
77
-->
88
<resources>
9+
<string name="jp_migration_help_button">Brauchst du Hilfe?</string>
10+
<string name="jp_migration_continue_button">Weiter</string>
11+
<string name="jp_migration_welcome_site_found_message">Wir haben deine Website gefunden. Fahre mit der Übertragung all deiner Daten fort und melde dich automatisch bei Jetpack an.</string>
12+
<string name="jp_migration_welcome_sites_found_message">Wir haben deine Websites gefunden. Fahre mit der Übertragung all deiner Daten fort und melde dich automatisch bei Jetpack an.</string>
13+
<string name="jp_migration_avatar_content_description">Dein Profilfoto</string>
14+
<string name="jp_migration_welcome_subtitle">Anscheinend wechselst du von der WordPress-App.</string>
15+
<string name="jp_migration_welcome_title">Willkommen bei Jetpack!</string>
16+
<string name="icon_desc">Icon</string>
917
<string name="post_settings_parent">Übergeordnete Seite</string>
1018
<string name="post_settings_page_attributes">Seitenattribute</string>
1119
<string name="about_automattic_contribute_item_title">Mitwirken</string>
@@ -3134,7 +3142,7 @@ Language: de
31343142
<string name="reader_toast_blog_blocked">Beiträge von dieser Website werden nicht länger angezeigt</string>
31353143
<string name="reader_menu_block_blog">Diese Website blockieren</string>
31363144
<string name="schedule_verb">Zeitplan</string>
3137-
<string name="update_verb">Update</string>
3145+
<string name="update_verb">Aktualisieren</string>
31383146
<string name="reader_empty_recommended_blogs">Keine empfohlenen Websites</string>
31393147
<string name="reader_toast_err_unfollow_blog">Kann das Folgen dieser Website nicht beenden</string>
31403148
<string name="reader_toast_err_follow_blog">Kann dieser Website nicht folgen</string>

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2022-11-04 10:36:55+0000
3+
Translation-Revision-Date: 2022-11-14 16:34:22+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
55
Generator: GlotPress/4.0.0-alpha.3
66
Language: en_GB
77
-->
88
<resources>
9+
<string name="jp_migration_continue_button">Continue</string>
10+
<string name="jp_migration_welcome_subtitle">It looks like you’re switching from the WordPress app.</string>
11+
<string name="jp_migration_help_button">Need help?</string>
12+
<string name="jp_migration_welcome_site_found_message">We found your site. Continue to transfer all your data and sign in to Jetpack automatically.</string>
13+
<string name="jp_migration_welcome_sites_found_message">We found your sites. Continue to transfer all your data and sign in to Jetpack automatically.</string>
14+
<string name="jp_migration_avatar_content_description">Your profile photo</string>
15+
<string name="jp_migration_welcome_title">Welcome to Jetpack!</string>
16+
<string name="icon_desc">icon</string>
917
<string name="post_settings_page_attributes">Page Attributes</string>
1018
<string name="post_settings_parent">Parent Page</string>
1119
<string name="about_automattic_contribute_item_title">Contribute</string>

‎WordPress/src/main/res/values-es/strings.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2022-11-02 20:22:48+0000
3+
Translation-Revision-Date: 2022-11-16 16:54:09+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
55
Generator: GlotPress/4.0.0-alpha.3
66
Language: es
77
-->
88
<resources>
9+
<string name="jp_migration_help_button">¿Necesitas ayuda?</string>
10+
<string name="jp_migration_continue_button">Continuar</string>
11+
<string name="jp_migration_welcome_site_found_message">Hemos encontrado tu sitio. Continúa para transferir todos tus datos y acceder a Jetpack automáticamente.</string>
12+
<string name="jp_migration_welcome_sites_found_message">Hemos encontrado tus sitios. Continúa para transferir todos tus datos y acceder a Jetpack automáticamente.</string>
13+
<string name="jp_migration_avatar_content_description">Tu foto de perfil</string>
14+
<string name="jp_migration_welcome_subtitle">Parece que estas realizando el cambio desde la aplicación de WordPress.</string>
15+
<string name="jp_migration_welcome_title">¡Te damos la bienvenida a Jetpack!</string>
16+
<string name="icon_desc">icono</string>
917
<string name="post_settings_parent">Página superior</string>
1018
<string name="post_settings_page_attributes">Atributos de la página</string>
1119
<string name="about_automattic_contribute_item_title">Contribuir</string>

‎WordPress/src/main/res/values-fr-rCA/strings.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2022-11-03 12:45:11+0000
3+
Translation-Revision-Date: 2022-11-18 09:54:08+0000
44
Plural-Forms: nplurals=2; plural=n > 1;
55
Generator: GlotPress/4.0.0-alpha.3
66
Language: fr
77
-->
88
<resources>
9+
<string name="jp_migration_help_button">Besoin d’aide ?</string>
10+
<string name="jp_migration_continue_button">Continuer</string>
11+
<string name="jp_migration_welcome_site_found_message">Nous avons trouvé votre site. Cliquez sur Continuer pour transférer l’ensemble de vos données et vous connecter automatiquement à Jetpack.</string>
12+
<string name="jp_migration_welcome_sites_found_message">Nous avons trouvé vos sites. Cliquez sur Continuer pour transférer l’ensemble de vos données et vous connecter automatiquement à Jetpack.</string>
13+
<string name="jp_migration_avatar_content_description">Votre photo de profil</string>
14+
<string name="jp_migration_welcome_subtitle">Il semblerait que vous ayez transféré vos données depuis l’application WordPress.</string>
15+
<string name="jp_migration_welcome_title">Bienvenue dans Jetpack !</string>
16+
<string name="icon_desc">icône</string>
917
<string name="post_settings_parent">Page parente</string>
1018
<string name="post_settings_page_attributes">Attributs de la page</string>
1119
<string name="about_automattic_contribute_item_title">Contribuer</string>

‎WordPress/src/main/res/values-fr/strings.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2022-11-03 12:45:11+0000
3+
Translation-Revision-Date: 2022-11-18 09:54:08+0000
44
Plural-Forms: nplurals=2; plural=n > 1;
55
Generator: GlotPress/4.0.0-alpha.3
66
Language: fr
77
-->
88
<resources>
9+
<string name="jp_migration_help_button">Besoin d’aide ?</string>
10+
<string name="jp_migration_continue_button">Continuer</string>
11+
<string name="jp_migration_welcome_site_found_message">Nous avons trouvé votre site. Cliquez sur Continuer pour transférer l’ensemble de vos données et vous connecter automatiquement à Jetpack.</string>
12+
<string name="jp_migration_welcome_sites_found_message">Nous avons trouvé vos sites. Cliquez sur Continuer pour transférer l’ensemble de vos données et vous connecter automatiquement à Jetpack.</string>
13+
<string name="jp_migration_avatar_content_description">Votre photo de profil</string>
14+
<string name="jp_migration_welcome_subtitle">Il semblerait que vous ayez transféré vos données depuis l’application WordPress.</string>
15+
<string name="jp_migration_welcome_title">Bienvenue dans Jetpack !</string>
16+
<string name="icon_desc">icône</string>
917
<string name="post_settings_parent">Page parente</string>
1018
<string name="post_settings_page_attributes">Attributs de la page</string>
1119
<string name="about_automattic_contribute_item_title">Contribuer</string>

0 commit comments

Comments
 (0)