Skip to content

Merge 18.4.0.2 into develop #17318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mokagio wants to merge 9 commits into from
Closed

Merge 18.4.0.2 into develop #17318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eabe39c
Release script: Update gutenberg-mobile ref
dcalhoun Oct 12, 2021
d1d2f69
Update Gutenberg ref
dcalhoun Oct 12, 2021
f2d2980
Update reference to Gutenberg Mobile
SiobhyB Oct 13, 2021
4a62a2a
Merge pull request #17302 from wordpress-mobile/gutenberg/integrate_r…
SiobhyB Oct 13, 2021
0efa290
Update translations
mokagio Oct 14, 2021
daa3150
Update metadata translations
mokagio Oct 14, 2021
1883853
Update Jetpack metadata translations
mokagio Oct 14, 2021
c8fc1b7
Bump version number
mokagio Oct 14, 2021
a74d600
Merge remote-tracking branch 'origin/develop' into merge/release-18.4…
mokagio Oct 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ abstract_target 'Apps' do
## Gutenberg (React Native)
## =====================
##
gutenberg :tag => 'v1.64.0-alpha2'
gutenberg :tag => 'v1.63.1'
Copy link
Contributor

@AliSoftware AliSoftware Oct 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This feels like the wrong conflict resolution to me (see previous comment)

Copy link
Member

@dcalhoun dcalhoun Oct 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed, the correct conflict resolution would be the newer tag within develop — 1.64.0-alpha2.


## Third party libraries
## =====================
Expand Down
186 changes: 93 additions & 93 deletions Podfile.lock
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions WordPress/Resources/ar.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2021-10-01 20:45:21+0000 */
/* Translation-Revision-Date: 2021-10-12 20:54:09+0000 */
/* 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)))); */
/* Generator: GlotPress/3.0.0-alpha.2 */
/* Language: ar */
Expand Down Expand Up @@ -239,7 +239,7 @@ translators: Block name. %s: The localized block name */
"%s has no URL set" = "ليس لدى %s عنوان URL معين";

/* translators: %s: embed block variant's label e.g: \"Twitter\". */
"%s link" = "%s link";
"%s link" = "%s رابط";

/* translators: %s: embed block variant's label e.g: \"Twitter\". */
"%s previews not yet available" = "معاينات %s غير متاحة حتى الآن";
Expand Down Expand Up @@ -1429,7 +1429,7 @@ translators: Block name. %s: The localized block name */
"City" = "المدينة";

/* Title of the card that starts the registration of a free domain with a paid plan, in the Domains Dashboard. */
"Claim your free domain" = "Claim your free domain";
"Claim your free domain" = "طالب بنطاقك المجاني";

/* Name of setting configured when a site uses a list of blog posts as its homepage */
"Classic Blog" = "المدونة التقليدية";
Expand Down Expand Up @@ -2278,7 +2278,7 @@ translators: Block name. %s: The localized block name */
"Domains" = "النطاقات";

/* Description for the first domain purchased with a free plan. */
"Domains purchased on this site will redirect users to " = "Domains purchased on this site will redirect users to ";
"Domains purchased on this site will redirect users to " = "ستعيد النطاقات التي تم شراؤها على هذا الموقع المستخدمين إلى ";

/* Label for button to log in using your site address. The underscores _..._ denote underline */
"Don't have an account? _Sign up_" = "ليس لديك حساب؟ _تسجيل_";
Expand Down Expand Up @@ -4546,7 +4546,7 @@ translators: Block name. %s: The localized block name */
"No preview available" = "لا توجد معاينة متاحة";

/* String to display in place of the site address, in case it was not retrieved from the backend. */
"No primary site address found" = "No primary site address found";
"No primary site address found" = "لم يتم العثور على عنوان الموقع الأساسي";

/* A message title */
"No recent posts" = "لا توجد مقالات حديثة";
Expand Down Expand Up @@ -5677,7 +5677,7 @@ translators: Block name. %s: The localized block name */
"Reply Text" = "نص الرد";

/* Provides hint that the screen displays a reply to a comment.%1$@ is a placeholder for the comment author that's been replied to.Example: Reply to Pamela Nguyen */
"Reply to %1$@" = "Reply to %1$@";
"Reply to %1$@" = "الرد على %1$@";

/* Placeholder text for replying to a comment */
"Reply to comment…" = "الرد على التعليق...";
Expand Down Expand Up @@ -5973,7 +5973,7 @@ translators: Block name. %s: The localized block name */
"Search button. Current button text is" = "زر البحث. نص الزر الحالي هو";

/* title of the button that searches the first domain. */
"Search for a domain" = "Search for a domain";
"Search for a domain" = "البحث عن نطاق";

/* No comment provided by engineer. */
"Search input field." = "حقل إدخال البحث.";
Expand Down Expand Up @@ -6371,7 +6371,7 @@ translators: Block name. %s: The localized block name */
"Site" = "الموقع";

/* Title of the Domains Dashboard. */
"Site Domains" = "Site Domains";
"Site Domains" = "نطاقات الموقع";

/* Accessibility label for site icon button */
"Site Icon" = "أيقونة الموقع";
Expand Down Expand Up @@ -8632,7 +8632,7 @@ translators: Block name. %s: The localized block name */
"You have 1 hidden WordPress site." = "لديك موقع WordPress واحد مخفى.";

/* Description for the first domain purchased with a paid plan. */
"You have a free one-year domain registration with your plan" = "You have a free one-year domain registration with your plan";
"You have a free one-year domain registration with your plan" = "لديك تسجيل مجال مجاني مدته عام واحد في خطتك";

/* Message alert when attempting to delete site with purchases */
"You have active premium upgrades on your site. Please cancel your upgrades prior to deleting your site." = "لديك ترقيات متميزة نشطة على موقعك. يرجى إلغاء ترقياتك قبل حذف موقعك.";
Expand Down Expand Up @@ -8711,7 +8711,7 @@ translators: Block name. %s: The localized block name */
"Your Domains" = "النطاقات الخاصة بك";

/* Header of the domains list section in the Domains Dashboard. */
"Your Site Domains" = "Your Site Domains";
"Your Site Domains" = "نطاقات موقعك";

/* The item to select during a guided tour. */
"Your Site Icon" = "أيقونة موقعك";
Expand Down Expand Up @@ -8744,7 +8744,7 @@ translators: Block name. %s: The localized block name */
"Your first backup will be ready soon" = "ستكون نسختك الاحتياطية الأولى جاهزة قريبًا";

/* Title of the site address section in the Domains Dashboard. */
"Your free WordPress.com address is" = "Your free WordPress.com address is";
"Your free WordPress.com address is" = "عنوان ووردبريس.كوم المجاني الخاص بك هو";

/* Error message when picked media cannot be imported into stories. */
"Your media could not be exported. If the problem persists you can contact us via the Me > Help & Support screen." = "لا يمكن تصدير ملفات الوسائط الخاصة بك. إذا استمرت المشكلة، يمكنك الاتصال بنا من خلال شاشة \"أنا\" > \"المساعدة والدعم\".";
Expand Down
22 changes: 11 additions & 11 deletions WordPress/Resources/de.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2021-10-03 19:19:58+0000 */
/* Translation-Revision-Date: 2021-10-12 15:54:08+0000 */
/* Plural-Forms: nplurals=2; plural=n != 1; */
/* Generator: GlotPress/3.0.0-alpha.2 */
/* Language: de */
Expand Down Expand Up @@ -239,7 +239,7 @@ translators: Block name. %s: The localized block name */
"%s has no URL set" = "Für %s wurde keine URL festgelegt";

/* translators: %s: embed block variant's label e.g: \"Twitter\". */
"%s link" = "%s link";
"%s link" = "%s Link";

/* translators: %s: embed block variant's label e.g: \"Twitter\". */
"%s previews not yet available" = "%s-Vorschauen noch nicht verfügbar";
Expand Down Expand Up @@ -1429,7 +1429,7 @@ translators: Block name. %s: The localized block name */
"City" = "Ort";

/* Title of the card that starts the registration of a free domain with a paid plan, in the Domains Dashboard. */
"Claim your free domain" = "Claim your free domain";
"Claim your free domain" = "Kostenlose Domain in Anspruch nehmen";

/* Name of setting configured when a site uses a list of blog posts as its homepage */
"Classic Blog" = "Klassischer Blog";
Expand Down Expand Up @@ -2278,7 +2278,7 @@ translators: Block name. %s: The localized block name */
"Domains" = "Domains";

/* Description for the first domain purchased with a free plan. */
"Domains purchased on this site will redirect users to " = "Domains purchased on this site will redirect users to ";
"Domains purchased on this site will redirect users to " = "Auf dieser Seite erworbene Domains werden Nutzer weiterleiten zu ";

/* Label for button to log in using your site address. The underscores _..._ denote underline */
"Don't have an account? _Sign up_" = "Du hast noch kein Konto? _Registrieren_";
Expand Down Expand Up @@ -4546,7 +4546,7 @@ translators: Block name. %s: The localized block name */
"No preview available" = "No preview available";

/* String to display in place of the site address, in case it was not retrieved from the backend. */
"No primary site address found" = "No primary site address found";
"No primary site address found" = "Es wurde keine Adresse für eine Haupt-Website gefunden";

/* A message title */
"No recent posts" = "Keine aktuellen Beiträge";
Expand Down Expand Up @@ -5677,7 +5677,7 @@ translators: Block name. %s: The localized block name */
"Reply Text" = "Antworttext";

/* Provides hint that the screen displays a reply to a comment.%1$@ is a placeholder for the comment author that's been replied to.Example: Reply to Pamela Nguyen */
"Reply to %1$@" = "Reply to %1$@";
"Reply to %1$@" = "%1$@ antworten";

/* Placeholder text for replying to a comment */
"Reply to comment…" = "Antwort auf Kommentar…";
Expand Down Expand Up @@ -5973,7 +5973,7 @@ translators: Block name. %s: The localized block name */
"Search button. Current button text is" = "Button suchen Aktueller Button-Text ist";

/* title of the button that searches the first domain. */
"Search for a domain" = "Search for a domain";
"Search for a domain" = "Domain suchen";

/* No comment provided by engineer. */
"Search input field." = "Eingabefelder suchen";
Expand Down Expand Up @@ -6371,7 +6371,7 @@ translators: Block name. %s: The localized block name */
"Site" = "Website";

/* Title of the Domains Dashboard. */
"Site Domains" = "Site Domains";
"Site Domains" = "Website-Domains";

/* Accessibility label for site icon button */
"Site Icon" = "Website-Icon";
Expand Down Expand Up @@ -8632,7 +8632,7 @@ translators: Block name. %s: The localized block name */
"You have 1 hidden WordPress site." = "Du hast eine versteckte WordPress-Website.";

/* Description for the first domain purchased with a paid plan. */
"You have a free one-year domain registration with your plan" = "You have a free one-year domain registration with your plan";
"You have a free one-year domain registration with your plan" = "In deinem Tarif ist eine kostenlose Domain-Registrierung für ein Jahr enthalten";

/* Message alert when attempting to delete site with purchases */
"You have active premium upgrades on your site. Please cancel your upgrades prior to deleting your site." = "Du hast aktive Premium-Upgrades auf deiner Seite. Bitte lösche deine Upgrades bevor du deine Website löschst.";
Expand Down Expand Up @@ -8711,7 +8711,7 @@ translators: Block name. %s: The localized block name */
"Your Domains" = "Deine Domains";

/* Header of the domains list section in the Domains Dashboard. */
"Your Site Domains" = "Your Site Domains";
"Your Site Domains" = "Deine Website-Domains";

/* The item to select during a guided tour. */
"Your Site Icon" = "Dein Website-Icon";
Expand Down Expand Up @@ -8744,7 +8744,7 @@ translators: Block name. %s: The localized block name */
"Your first backup will be ready soon" = "Dein erstes Backup ist bald fertig";

/* Title of the site address section in the Domains Dashboard. */
"Your free WordPress.com address is" = "Your free WordPress.com address is";
"Your free WordPress.com address is" = "Deine kostenlose WordPress.com-Adresse lautet";

/* Error message when picked media cannot be imported into stories. */
"Your media could not be exported. If the problem persists you can contact us via the Me > Help & Support screen." = "Deine Medien konnten nicht exportiert werden. If the problem persists you can contact us via the Me > Hilfe & Support.";
Expand Down
22 changes: 11 additions & 11 deletions WordPress/Resources/he.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Translation-Revision-Date: 2021-09-29 11:54:53+0000 */
/* Translation-Revision-Date: 2021-10-12 13:54:08+0000 */
/* Plural-Forms: nplurals=2; plural=n != 1; */
/* Generator: GlotPress/3.0.0-alpha.2 */
/* Language: he_IL */
Expand Down Expand Up @@ -239,7 +239,7 @@ translators: Block name. %s: The localized block name */
"%s has no URL set" = "ב-%s לא הוגדרה כתובת URL";

/* translators: %s: embed block variant's label e.g: \"Twitter\". */
"%s link" = "%s link";
"%s link" = "%s קישור";

/* translators: %s: embed block variant's label e.g: \"Twitter\". */
"%s previews not yet available" = "תצוגות מקדימות של %s עדיין לא זמינות";
Expand Down Expand Up @@ -1429,7 +1429,7 @@ translators: Block name. %s: The localized block name */
"City" = "עיר";

/* Title of the card that starts the registration of a free domain with a paid plan, in the Domains Dashboard. */
"Claim your free domain" = "Claim your free domain";
"Claim your free domain" = "לקבל דומיין בחינם";

/* Name of setting configured when a site uses a list of blog posts as its homepage */
"Classic Blog" = "בלוג קלאסי";
Expand Down Expand Up @@ -2278,7 +2278,7 @@ translators: Block name. %s: The localized block name */
"Domains" = "דומיינים";

/* Description for the first domain purchased with a free plan. */
"Domains purchased on this site will redirect users to " = "Domains purchased on this site will redirect users to ";
"Domains purchased on this site will redirect users to " = "דומיינים שנרכשו באתר זה ינתבו את המשתמשים אל ";

/* Label for button to log in using your site address. The underscores _..._ denote underline */
"Don't have an account? _Sign up_" = "אין לך חשבון עדיין? _הרשמה_";
Expand Down Expand Up @@ -4546,7 +4546,7 @@ translators: Block name. %s: The localized block name */
"No preview available" = "תצוגה מקדימה לא זמינה";

/* String to display in place of the site address, in case it was not retrieved from the backend. */
"No primary site address found" = "No primary site address found";
"No primary site address found" = "לא נמצא כתובת אתר ראשי";

/* A message title */
"No recent posts" = "אין פוסטים מהזמן האחרון";
Expand Down Expand Up @@ -5677,7 +5677,7 @@ translators: Block name. %s: The localized block name */
"Reply Text" = "טקסט תגובה";

/* Provides hint that the screen displays a reply to a comment.%1$@ is a placeholder for the comment author that's been replied to.Example: Reply to Pamela Nguyen */
"Reply to %1$@" = "Reply to %1$@";
"Reply to %1$@" = "לענות ל-%1$@";

/* Placeholder text for replying to a comment */
"Reply to comment…" = "מענה לתגובה...";
Expand Down Expand Up @@ -5973,7 +5973,7 @@ translators: Block name. %s: The localized block name */
"Search button. Current button text is" = "הכפתור 'חיפוש'. הטקסט הנוכחי של הכפתור הוא";

/* title of the button that searches the first domain. */
"Search for a domain" = "Search for a domain";
"Search for a domain" = "לחפש דומיין";

/* No comment provided by engineer. */
"Search input field." = "שדה להזנת חיפוש.";
Expand Down Expand Up @@ -6371,7 +6371,7 @@ translators: Block name. %s: The localized block name */
"Site" = "אתר";

/* Title of the Domains Dashboard. */
"Site Domains" = "Site Domains";
"Site Domains" = "דומיינים באתר";

/* Accessibility label for site icon button */
"Site Icon" = "סמל אתר";
Expand Down Expand Up @@ -8632,7 +8632,7 @@ translators: Block name. %s: The localized block name */
"You have 1 hidden WordPress site." = "יש לך אתר WordPress מוסתר אחד.";

/* Description for the first domain purchased with a paid plan. */
"You have a free one-year domain registration with your plan" = "You have a free one-year domain registration with your plan";
"You have a free one-year domain registration with your plan" = "אנחנו מעניקים לך רישום דומיין בחינם לשנה עם התוכנית שלך";

/* Message alert when attempting to delete site with purchases */
"You have active premium upgrades on your site. Please cancel your upgrades prior to deleting your site." = "קיימים שדרוגים פעילים באתר שלך. יש לבטל את השדרוגים לפני מחיקת האתר.";
Expand Down Expand Up @@ -8711,7 +8711,7 @@ translators: Block name. %s: The localized block name */
"Your Domains" = "הדומיינים שלך";

/* Header of the domains list section in the Domains Dashboard. */
"Your Site Domains" = "Your Site Domains";
"Your Site Domains" = "הדומיינים באתר שלך";

/* The item to select during a guided tour. */
"Your Site Icon" = "הסמל של האתר שלך";
Expand Down Expand Up @@ -8744,7 +8744,7 @@ translators: Block name. %s: The localized block name */
"Your first backup will be ready soon" = "הגיבוי הראשון שלך יהיה מוכן בקרוב";

/* Title of the site address section in the Domains Dashboard. */
"Your free WordPress.com address is" = "Your free WordPress.com address is";
"Your free WordPress.com address is" = "הכתובת החינמית שלך ב-WordPress.com היא";

/* Error message when picked media cannot be imported into stories. */
"Your media could not be exported. If the problem persists you can contact us via the Me > Help & Support screen." = "לא ניתן היה לייצא את המדיה שלך. If the problem persists you can contact us via the Me > מסך 'עזרה ותמיכה'.";
Expand Down
Loading