Skip to content

Commit

Permalink
Merge branch 'trunk' into feature/per-app-language-prefs
Browse files Browse the repository at this point in the history
  • Loading branch information
nbradbury authored Dec 17, 2024
2 parents 2c56200 + 4495d1a commit f10e29f
Show file tree
Hide file tree
Showing 93 changed files with 8,134 additions and 7,354 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/automated-version-update-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
echo "::set-output name=description::$PR_DESCRIPTION"
id: pr_description

- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Update Gutenberg Mobile Version
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gradle-wrapper-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ jobs:
name: "Validation"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: gradle/wrapper-validation-action@v1
- uses: actions/checkout@v4
- uses: gradle/actions/wrapper-validation@v4
4 changes: 4 additions & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
*** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]

25.7
-----


25.6
-----

Expand Down
7 changes: 2 additions & 5 deletions WordPress/jetpack_metadata/release_notes.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
This month, we've:
- Fixed broken social media icons in Jetpack Social
- Fixed some Dark Mode bugs
- We've brought the experimental editor to Android – give it a try and let us know what you think!
- Adjusted how users log into WordPress.com – this fixes a long-standing issue where you couldn't log in if you used a Passkey.


6 changes: 2 additions & 4 deletions WordPress/metadata/release_notes.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
This month, we've:
- Fixed some Dark Mode bugs
- We've brought the experimental editor to Android – give it a try and let us know what you think!
- Adjusted how users log into WordPress.com – this fixes a long-standing issue where you couldn't log in if you used a Passkey.


271 changes: 150 additions & 121 deletions WordPress/src/main/res/values-ar/strings.xml

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions WordPress/src/main/res/values-az/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ Language: az
<string name="hide">Gizlət</string>
<string name="select_all">Tamamını seç</string>
<string name="language">Dil</string>
<string name="verification_code" tools:ignore="UnusedResources" a8c-src-lib="login">Təsdiqləmə kodu</string>
<string name="invalid_verification_code" tools:ignore="UnusedResources" a8c-src-lib="login">Keçərsiz təsdiqləmə kodu</string>
<string name="verification_code" tools:ignore="UnusedResources" a8c-src-lib="module:login">Təsdiqləmə kodu</string>
<string name="invalid_verification_code" tools:ignore="UnusedResources" a8c-src-lib="module:login">Keçərsiz təsdiqləmə kodu</string>
<string name="reader_empty_posts_request_failed">Yazılar geri alına bilmir</string>
<string name="error_notification_open">Bildiriş açılmadı</string>
<string name="stats_search_terms_unknown_search_terms">Bilinməyən Axtarış Kriteriyaları</string>
Expand Down Expand Up @@ -126,7 +126,7 @@ Language: az
<string name="error_downloading_image">Təsvir endirilərkən xəta baş verdi</string>
<string name="error_edit_comment">Şərh redaktəsi sırasında xəta baş verdi</string>
<string name="invalid_email_message">Keçərsiz e-poçt ünvanı</string>
<string name="email_invalid" tools:ignore="UnusedResources" a8c-src-lib="login">Etibarlı e-poçt ünvanı daxil edin</string>
<string name="email_invalid" tools:ignore="UnusedResources" a8c-src-lib="module:login">Etibarlı e-poçt ünvanı daxil edin</string>
<string name="username_or_password_incorrect">Yanlış istifadəçi adı və ya parol daxil etdiniz</string>
<string name="select_categories">Kateqoriyaları seç</string>
<string name="connection_error">Qoşulma xətası</string>
Expand All @@ -138,7 +138,7 @@ Language: az
<string name="wordpress_blog">WordPress bloqu</string>
<string name="error_blog_hidden">Bu bloq gizlidir və yüklənmədi. Parametrlərdən yenidən aktivləşdirin və təkrar yoxlayın.</string>
<string name="fatal_db_error">Proqram üçün verilənlər bazası yaradılarkən bir xəta baş verdi. Proqramı təkrar qurmağa cəhd edin.</string>
<string name="http_authorization_required" tools:ignore="UnusedResources" a8c-src-lib="login">Qeydiyyat gərəklidir</string>
<string name="http_authorization_required" tools:ignore="UnusedResources" a8c-src-lib="module:login">Qeydiyyat gərəklidir</string>
<string name="view_in_browser">Brauzerdə bax</string>
<string name="add_new_category">Yeni kateqoriya əlavə et</string>
<string name="category_name">Kateqoriya adı</string>
Expand Down Expand Up @@ -217,8 +217,8 @@ Language: az
<string name="more_notifications">və %d daha çox.</string>
<string name="new_notifications">%d yeni bildirişlər</string>
<string name="loading">Yüklənir…</string>
<string name="httpuser" tools:ignore="UnusedResources" a8c-src-lib="login">HTTP istifadəçi adı</string>
<string name="httppassword" tools:ignore="UnusedResources" a8c-src-lib="login">HTTP parolu</string>
<string name="httpuser" tools:ignore="UnusedResources" a8c-src-lib="module:login">HTTP istifadəçi adı</string>
<string name="httppassword" tools:ignore="UnusedResources" a8c-src-lib="module:login">HTTP parolu</string>
<string name="error_media_upload">Media faylının yüklənməsi zamanı xəta baş verdi.</string>
<string name="incorrect_credentials">Yanlış istifadəçi adı və ya parol</string>
<string name="password">Parol</string>
Expand Down
Loading

0 comments on commit f10e29f

Please sign in to comment.