Skip to content

Commit

Permalink
Merge changes from 24.8.0.3 (#23169)
Browse files Browse the repository at this point in the history
  • Loading branch information
dvdchr authored May 7, 2024
2 parents 86dcc60 + 746236e commit ddb6069
Show file tree
Hide file tree
Showing 33 changed files with 3,068 additions and 103 deletions.
6 changes: 3 additions & 3 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ PODS:
- WordPressKit (~> 17.0)
- WordPressShared (~> 2.1-beta)
- WordPressUI (~> 1.7-beta)
- WordPressKit (17.1.0):
- WordPressKit (17.1.1):
- NSObject-SafeExpectations (~> 0.0.4)
- UIDeviceIdentifier (~> 2.0)
- WordPressShared (~> 2.0-beta)
Expand Down Expand Up @@ -132,6 +132,7 @@ SPEC REPOS:
- WordPress-Aztec-iOS
- WordPress-Editor-iOS
- WordPressAuthenticator
- WordPressKit
- WordPressShared
trunk:
- Alamofire
Expand Down Expand Up @@ -160,7 +161,6 @@ SPEC REPOS:
- SVProgressHUD
- SwiftLint
- UIDeviceIdentifier
- WordPressKit
- WordPressUI
- wpxmlrpc
- ZendeskCommonUISDK
Expand Down Expand Up @@ -216,7 +216,7 @@ SPEC CHECKSUMS:
WordPress-Aztec-iOS: 3732c6d865a5c9f35788377bdeda8a80ea10d0a1
WordPress-Editor-iOS: 453345420ced3d3ef20f0051b3df46ff10281e0c
WordPressAuthenticator: 898acaac75c5ade9b900c02622a15b9aef8fde1a
WordPressKit: 4042625f32513a98fe1bc8552f1aa59ef236bcdc
WordPressKit: a4af3d5d071734aaec75ccecefc7850ece6068fc
WordPressShared: 0160364ed24f4d67fed4e85003fefa837faad84f
WordPressUI: ec5ebcf7e63e797ba51d07513e340c1b14cf45a4
wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
Expand Down
275 changes: 271 additions & 4 deletions WordPress/Resources/ar.lproj/Localizable.strings

Large diffs are not rendered by default.

28 changes: 22 additions & 6 deletions WordPress/Resources/de.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2024-04-30 07:28:34+0000 */
/* Translation-Revision-Date: 2024-05-02 17:48:29+0000 */
/* Plural-Forms: nplurals=2; plural=n != 1; */
/* Generator: GlotPress/4.0.1 */
/* Language: de */
Expand Down Expand Up @@ -10924,6 +10924,9 @@ with the filter chip button. */
/* Reader settings button accessibility label. */
"reader.navigation.settings.button.label" = "Reader-Einstellungen";

/* No Tags View Button Label */
"reader.no.blog.title" = "Einen Blog hinzufügen";

/* Title for button on the no followed blogs result screen */
"reader.no.blogs.button" = "Blogs entdecken";

Expand All @@ -10949,7 +10952,7 @@ with the filter chip button. */
"reader.no.results.subscriptions.button" = "Gehe zu Abonnements";

/* No Tags View Button Label */
"reader.no.tags.title" = "Einen Blog hinzufügen";
"reader.no.tags.title" = "Ein Schlagwort hinzufügen";

/* Notice title when blocking a blog fails. */
"reader.notice.blog.blocked.failure" = "Der Blog kann nicht blockiert werden";
Expand Down Expand Up @@ -11667,6 +11670,15 @@ Refer to: `reader.preferences.preview.body.feedback.format` */
/* A hint shown to the user in stats informing the user that one of their posts has received a like. The %1$@ placeholder will be replaced with the title of a post, and the %2$@ will be replaced by the numeral one. */
"stats.insights.totalLikes.guideText.singular" = "Dein neuester Beitrag %1$@ hat %2$@ Like erhalten.";

/* Label displaying total number of WordPress.com subscribers. %@ is the total. */
"stats.insights.totalSubscribers.dotcomCount" = "WordPress.com-Abonnenten insgesamt: %@";

/* Label displaying total number of email subscribers. %@ is the total. */
"stats.insights.totalSubscribers.emailCount" = "E-Mail-Abonnenten insgesamt: %@";

/* Insights 'Total Subscribers' header */
"stats.insights.totalSubscribers.title" = "Abonnenten insgesamt";

/* Text for the Stats Traffic Overview stat difference label. Shows the change from the previous period, including the percentage value. E.g.: +12.3K (5%). %1$@ is the placeholder for the change sign ('-', '+', or none). %2$@ is the placeholder for the change numerical value. %3$@ is the placeholder for the change percentage value. */
"stats.overview.differenceLabelWithNumber" = "%1$@%2$@ (%3$@)";

Expand Down Expand Up @@ -11751,10 +11763,12 @@ Refer to: `reader.preferences.preview.body.feedback.format` */
/* The button title for the Submit button in the In-App Feedback screen */
"submit.feedback.submit.button" = "Übermitteln";

/* Notice informing user that their feedback is being submitted anonymously.
Notice informing user that their feedback is being submitted. */
/* Notice informing user that their feedback is being submitted. */
"submit.feedback.submit.loading" = "Wird gesendet";

/* Notice informing user that their feedback is being submitted anonymously. */
"submit.feedback.submitAnonymously.loading" = "Wird anonym gesendet";

/* The title for the the In-App Feedback screen */
"submit.feedback.title" = "Feedback";

Expand Down Expand Up @@ -11938,8 +11952,10 @@ Refer to: `reader.preferences.preview.body.feedback.format` */
/* Site's Viewers Profile. Displayed when the name is empty! */
"user.details.title.viewer" = "Besucher der Website";

/* Site Email Subscribers
Site Subscribers */
/* Site Email Subscribers */
"users.list.title.emailSubscribers" = "E-Mail-Abonnenten";

/* Site Subscribers */
"users.list.title.subscribers" = "Abonnenten";

/* Portion of a message for Jetpack users that have multisite WP installation, thus Restore is not available. This part is a link, colored with a different color. */
Expand Down
3 changes: 0 additions & 3 deletions WordPress/Resources/en-CA.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -10681,9 +10681,6 @@ with the filter chip button. */
/* Button title. Tapping lets the user view the blogs they're subscribed to. */
"reader.no.results.subscriptions.button" = "Go to Subscriptions";

/* No Tags View Button Label */
"reader.no.tags.title" = "Add a blog";

/* Notice title when blocking a blog fails. */
"reader.notice.blog.blocked.failure" = "Unable to block blog";

Expand Down
28 changes: 22 additions & 6 deletions WordPress/Resources/en-GB.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2024-04-30 08:19:40+0000 */
/* Translation-Revision-Date: 2024-05-01 20:22:33+0000 */
/* Plural-Forms: nplurals=2; plural=n != 1; */
/* Generator: GlotPress/4.0.1 */
/* Language: en_GB */
Expand Down Expand Up @@ -10924,6 +10924,9 @@ with the filter chip button. */
/* Reader settings button accessibility label. */
"reader.navigation.settings.button.label" = "Reader Settings";

/* No Tags View Button Label */
"reader.no.blog.title" = "Add a blog";

/* Title for button on the no followed blogs result screen */
"reader.no.blogs.button" = "Discover Blogs";

Expand All @@ -10949,7 +10952,7 @@ with the filter chip button. */
"reader.no.results.subscriptions.button" = "Go to Subscriptions";

/* No Tags View Button Label */
"reader.no.tags.title" = "Add a blog";
"reader.no.tags.title" = "Add a tag";

/* Notice title when blocking a blog fails. */
"reader.notice.blog.blocked.failure" = "Unable to block blog";
Expand Down Expand Up @@ -11667,6 +11670,15 @@ Refer to: `reader.preferences.preview.body.feedback.format` */
/* A hint shown to the user in stats informing the user that one of their posts has received a like. The %1$@ placeholder will be replaced with the title of a post, and the %2$@ will be replaced by the numeral one. */
"stats.insights.totalLikes.guideText.singular" = "Your latest post %1$@ has received %2$@ like.";

/* Label displaying total number of WordPress.com subscribers. %@ is the total. */
"stats.insights.totalSubscribers.dotcomCount" = "Total WordPress.com subscribers: %@";

/* Label displaying total number of email subscribers. %@ is the total. */
"stats.insights.totalSubscribers.emailCount" = "Total email subscribers: %@";

/* Insights 'Total Subscribers' header */
"stats.insights.totalSubscribers.title" = "Total Subscribers";

/* Text for the Stats Traffic Overview stat difference label. Shows the change from the previous period, including the percentage value. E.g.: +12.3K (5%). %1$@ is the placeholder for the change sign ('-', '+', or none). %2$@ is the placeholder for the change numerical value. %3$@ is the placeholder for the change percentage value. */
"stats.overview.differenceLabelWithNumber" = "%1$@%2$@ (%3$@)";

Expand Down Expand Up @@ -11751,10 +11763,12 @@ Refer to: `reader.preferences.preview.body.feedback.format` */
/* The button title for the Submit button in the In-App Feedback screen */
"submit.feedback.submit.button" = "Submit";

/* Notice informing user that their feedback is being submitted anonymously.
Notice informing user that their feedback is being submitted. */
/* Notice informing user that their feedback is being submitted. */
"submit.feedback.submit.loading" = "Sending";

/* Notice informing user that their feedback is being submitted anonymously. */
"submit.feedback.submitAnonymously.loading" = "Sending anonymously";

/* The title for the the In-App Feedback screen */
"submit.feedback.title" = "Feedback";

Expand Down Expand Up @@ -11938,8 +11952,10 @@ Refer to: `reader.preferences.preview.body.feedback.format` */
/* Site's Viewers Profile. Displayed when the name is empty! */
"user.details.title.viewer" = "Site's Viewer";

/* Site Email Subscribers
Site Subscribers */
/* Site Email Subscribers */
"users.list.title.emailSubscribers" = "Email Subscribers";

/* Site Subscribers */
"users.list.title.subscribers" = "Subscribers";

/* Portion of a message for Jetpack users that have multisite WP installation, thus Restore is not available. This part is a link, colored with a different color. */
Expand Down
28 changes: 22 additions & 6 deletions WordPress/Resources/es.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2024-04-30 07:03:04+0000 */
/* Translation-Revision-Date: 2024-05-02 09:00:33+0000 */
/* Plural-Forms: nplurals=2; plural=n != 1; */
/* Generator: GlotPress/4.0.1 */
/* Language: es */
Expand Down Expand Up @@ -10924,6 +10924,9 @@ with the filter chip button. */
/* Reader settings button accessibility label. */
"reader.navigation.settings.button.label" = "Configuración del lector";

/* No Tags View Button Label */
"reader.no.blog.title" = "Añadir un blog";

/* Title for button on the no followed blogs result screen */
"reader.no.blogs.button" = "Descubrir blogs";

Expand All @@ -10949,7 +10952,7 @@ with the filter chip button. */
"reader.no.results.subscriptions.button" = "Ir a suscripciones";

/* No Tags View Button Label */
"reader.no.tags.title" = "Añadir un blog";
"reader.no.tags.title" = "Añadir una etiqueta";

/* Notice title when blocking a blog fails. */
"reader.notice.blog.blocked.failure" = "No se puede bloquear el blog";
Expand Down Expand Up @@ -11667,6 +11670,15 @@ Refer to: `reader.preferences.preview.body.feedback.format` */
/* A hint shown to the user in stats informing the user that one of their posts has received a like. The %1$@ placeholder will be replaced with the title of a post, and the %2$@ will be replaced by the numeral one. */
"stats.insights.totalLikes.guideText.singular" = "Tu última entrada %1$@ ha recibido %2$@ me gusta.";

/* Label displaying total number of WordPress.com subscribers. %@ is the total. */
"stats.insights.totalSubscribers.dotcomCount" = "Suscriptores totales de WordPress.com: %@";

/* Label displaying total number of email subscribers. %@ is the total. */
"stats.insights.totalSubscribers.emailCount" = "Suscriptores totales por correo electrónico: %@";

/* Insights 'Total Subscribers' header */
"stats.insights.totalSubscribers.title" = "Suscriptores totales";

/* Text for the Stats Traffic Overview stat difference label. Shows the change from the previous period, including the percentage value. E.g.: +12.3K (5%). %1$@ is the placeholder for the change sign ('-', '+', or none). %2$@ is the placeholder for the change numerical value. %3$@ is the placeholder for the change percentage value. */
"stats.overview.differenceLabelWithNumber" = "%1$@%2$@ (%3$@)";

Expand Down Expand Up @@ -11751,10 +11763,12 @@ Refer to: `reader.preferences.preview.body.feedback.format` */
/* The button title for the Submit button in the In-App Feedback screen */
"submit.feedback.submit.button" = "Enviar";

/* Notice informing user that their feedback is being submitted anonymously.
Notice informing user that their feedback is being submitted. */
/* Notice informing user that their feedback is being submitted. */
"submit.feedback.submit.loading" = "Enviando";

/* Notice informing user that their feedback is being submitted anonymously. */
"submit.feedback.submitAnonymously.loading" = "Enviando de manera anónima";

/* The title for the the In-App Feedback screen */
"submit.feedback.title" = "Sugerencias";

Expand Down Expand Up @@ -11938,8 +11952,10 @@ Refer to: `reader.preferences.preview.body.feedback.format` */
/* Site's Viewers Profile. Displayed when the name is empty! */
"user.details.title.viewer" = "Visor del sitio";

/* Site Email Subscribers
Site Subscribers */
/* Site Email Subscribers */
"users.list.title.emailSubscribers" = "Suscriptores por correo electrónico";

/* Site Subscribers */
"users.list.title.subscribers" = "Suscriptores";

/* Portion of a message for Jetpack users that have multisite WP installation, thus Restore is not available. This part is a link, colored with a different color. */
Expand Down
Loading

0 comments on commit ddb6069

Please sign in to comment.