diff --git a/.github/workflows/android-ci-comment.yml b/.github/workflows/android-ci-comment.yml
index 64422e284..b200c9a70 100644
--- a/.github/workflows/android-ci-comment.yml
+++ b/.github/workflows/android-ci-comment.yml
@@ -1,6 +1,10 @@
 name: Android CI Comment
 
-on: [pull_request_target]
+on:
+  workflow_run:
+    workflows: ["Android CI"]  
+    types: [completed]        
+    branches: [main]          
 
 permissions:
   issues: write
@@ -9,16 +13,17 @@ jobs:
   comment:
     name: Comment on PR with APK links
     runs-on: ubuntu-latest
+    if: github.event.workflow_run.conclusion == 'success'  
     steps:
       - name: Checkout base branch
         uses: actions/checkout@v3
         with:
-          ref: ${{ github.base_ref }} 
-
+          ref: ${{ github.event.workflow_run.head_branch }}  
       - name: Download Run ID Artifact
         uses: actions/download-artifact@v4
         with:
           name: run-id
+          run-id: ${{ github.event.workflow_run.id }}  
 
       - name: Read Run ID
         id: read-run-id
@@ -26,7 +31,7 @@ jobs:
 
       - name: Comment on PR with APK download links
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         uses: actions/github-script@v6
         with:
           script: |
@@ -41,6 +46,13 @@ jobs:
                 throw new Error('Run ID not found.');
               }
 
+              // Get the PR number from the workflow_run event
+              const prNumber = ${{ github.event.workflow_run.pull_requests[0].number }};
+              if (!prNumber) {
+                console.log('No PR number found in workflow_run event.');
+                return;
+              }
+
               const { data: { artifacts } } = await github.rest.actions.listWorkflowRunArtifacts({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
@@ -71,7 +83,7 @@ jobs:
               `;
 
               await github.rest.issues.createComment({
-                issue_number: context.issue.number,
+                issue_number: prNumber,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 body: commentBody
diff --git a/README.md b/README.md
index d7e9d334b..0b31ff5be 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Wikimedia Commons Android app
 ![GitHub issue custom search](https://img.shields.io/github/issues-search?label=%22good%20first%20issue%22%20issues&query=repo%3Acommons-app%2Fapps-android-commons%20is%3Aissue%20is%3Aopen%20label%3A%22good%20first%20issue%22)
-[![Build status](https://github.com/commons-app/apps-android-commons/actions/workflows/android.yml/badge.svg?branch=master)](https://github.com/commons-app/apps-android-commons/actions?query=branch%3Amaster)
+[![Build status](https://github.com/commons-app/apps-android-commons/actions/workflows/android.yml/badge.svg?branch=main)](https://github.com/commons-app/apps-android-commons/actions?query=branch%3Amain)
 [![Preview the app](https://img.shields.io/badge/Preview-Appetize.io-orange.svg)](https://appetize.io/app/8ywtpe9f8tb8h6bey11c92vkcw)
 [![codecov](https://codecov.io/gh/commons-app/apps-android-commons/branch/master/graph/badge.svg)](https://codecov.io/gh/commons-app/apps-android-commons)
 
diff --git a/app/src/main/res/values-diq/strings.xml b/app/src/main/res/values-diq/strings.xml
index cf48861d0..5ffda9f2e 100644
--- a/app/src/main/res/values-diq/strings.xml
+++ b/app/src/main/res/values-diq/strings.xml
@@ -3,6 +3,7 @@
 * 1917 Ekim Devrimi
 * Envlh
 * Gambollar
+* GolyatGeri
 * Gorizon
 * Gırd
 * Marmase
@@ -199,7 +200,7 @@
   <string name="navigation_item_review">Çım berze cı</string>
   <string name="no_description_found">İzahat nêvineya</string>
   <string name="nearby_info_menu_commons_article">Pela dosyay commonsi</string>
-  <string name="nearby_info_menu_wikidata_article">Pbcey Wikidata</string>
+  <string name="nearby_info_menu_wikidata_article">Pbcey Wikidayıt</string>
   <string name="nearby_info_menu_wikipedia_article">Meqaley Wikipedia</string>
   <string name="upload_problem_exist">Muhtemel problemê nê resımi</string>
   <string name="upload_problem_image_dark">Resım zehf tariyo.</string>
@@ -216,7 +217,7 @@
   <string name="skip_login">Ravêre</string>
   <string name="navigation_item_login">Cı kewe</string>
   <string name="nearby_directions">Telimati</string>
-  <string name="nearby_wikidata">Wikidata</string>
+  <string name="nearby_wikidata">Wikidayıt</string>
   <string name="nearby_wikipedia">Wikipediya</string>
   <string name="nearby_commons">Commons</string>
   <string name="about_rate_us">Rey bıdê</string>
@@ -246,7 +247,7 @@
   <string name="explore_tab_title_featured">Weçinaye</string>
   <string name="explore_tab_title_mobile">Raya mobiliya biyo bar</string>
   <string name="explore_tab_title_map">Xerita</string>
-  <string name="successful_wikidata_edit">Resım , Wikidata dê biyo obcey %1$s miyan!</string>
+  <string name="successful_wikidata_edit">Resım , Wikidayıt dê biyo obcey %1$s miyan!</string>
   <string name="menu_set_wallpaper">Wallpaper eyar kerê</string>
   <string name="wallpaper_set_successfully">Wallpaper eyar biyo!</string>
   <string name="quiz">Quiz</string>
diff --git a/app/src/main/res/values-ps/strings.xml b/app/src/main/res/values-ps/strings.xml
index 8c9e91ca5..0fc6a3dc0 100644
--- a/app/src/main/res/values-ps/strings.xml
+++ b/app/src/main/res/values-ps/strings.xml
@@ -56,7 +56,7 @@
   <string name="menu_settings">امستنې</string>
   <string name="intent_share_upload_label">خونديځ ته راپورته کول</string>
   <string name="upload_in_progress">راپورته کول جريان لري</string>
-  <string name="username">کارننوم</string>
+  <string name="username">کارن‌نوم</string>
   <string name="password">پټنوم</string>
   <string name="login_credential">خپل خونديځ بېټا ګڼون ته ورننوځئ</string>
   <string name="login">ننوتل</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 802a1e350..d25d949ae 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -876,6 +876,7 @@
   <string name="account">Учётная запись</string>
   <string name="vanish_account">Удалить учётную запись</string>
   <string name="account_vanish_request_confirm_title">Предупреждение об удалении учётной записи</string>
+  <string name="account_vanish_request_confirm">Удаление — это &lt;b&gt;крайняя мера&lt;/b&gt;, и её следует &lt;b&gt;использовать только в том случае, если вы хотите навсегда прекратить редактирование&lt;/b&gt;, а также скрыть как можно больше связанных с вами действий.&lt;br/&gt;&lt;br/&gt; Удаление вашей учётной записи на Викискладе осуществляется путём изменения её имени, чтобы другие не могли определить ваши действия. &lt;b&gt;Удаление не гарантирует полной анонимности или удаления вклада в проектах&lt;/b&gt;.</string>
   <string name="caption">Подпись</string>
   <string name="caption_copied_to_clipboard">Подпись скопирована в буфер обмена</string>
   <string name="congratulations_all_pictures_in_this_album_have_been_either_uploaded_or_marked_as_not_for_upload">Поздравляем, все фотографии в этом альбоме либо загружены, либо помечены как не предназначенные для загрузки.</string>