From 6cc855cc9b9efaf418e0104ac36ad0f2b1938ec0 Mon Sep 17 00:00:00 2001
From: 0xd9a <0xd9a@noreply.codeberg.org>
Date: Fri, 22 Aug 2025 16:39:05 +0530
Subject: [PATCH 1/5] Remove wrong summary from "Change the language"
 preference

---
 app/src/main/res/xml/pref_language.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/xml/pref_language.xml b/app/src/main/res/xml/pref_language.xml
index ae608822..9e96dca4 100644
--- a/app/src/main/res/xml/pref_language.xml
+++ b/app/src/main/res/xml/pref_language.xml
@@ -8,7 +8,6 @@
         app:entryValues="@array/SET_TRANSLATE_ENTRIES"
         app:iconSpaceReserved="false"
         app:key="@string/SET_DEFAULT_LOCALE_NEW"
-        app:summary="@string/set_push_notifications"
         app:title="@string/set_change_locale"
         app:useSimpleSummaryProvider="true" />
 

From 45b9660e5d72377fe7d23b56aa05c7534142dabf Mon Sep 17 00:00:00 2001
From: 0xd9a <0xd9a@noreply.codeberg.org>
Date: Fri, 22 Aug 2025 16:39:47 +0530
Subject: [PATCH 2/5] Add Persian language to "Change the language" preference
 (fix #1283)

---
 app/src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 709be23a..2ab51331 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1040,6 +1040,7 @@
         <item>pl</item>
         <item>sr</item>
         <item>uk</item>
+        <item>fa</item>
         <item>ru</item>
         <item>no</item>
         <item>kab</item>
@@ -1136,6 +1137,7 @@
         <item>Polski</item>
         <item>Српски</item>
         <item>Українська</item>
+        <item>فارسی</item>
         <item>Русский</item>
         <item>Norsk</item>
         <item>Taqbaylit</item>

From df0b63836faa6aabe3f24227b05c3d57e545827e Mon Sep 17 00:00:00 2001
From: 0xd9a <0xd9a@noreply.codeberg.org>
Date: Fri, 22 Aug 2025 16:50:26 +0530
Subject: [PATCH 3/5] Make profile picture move to right side of title in
 conversation page in RTL mode (fix #1284)

---
 .../mastodon/layout/activity_conversation.xml | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/layouts/mastodon/layout/activity_conversation.xml b/app/src/main/res/layouts/mastodon/layout/activity_conversation.xml
index c87bb067..636e91a9 100644
--- a/app/src/main/res/layouts/mastodon/layout/activity_conversation.xml
+++ b/app/src/main/res/layouts/mastodon/layout/activity_conversation.xml
@@ -41,21 +41,29 @@
                 android:fitsSystemWindows="true"
                 app:layout_scrollFlags="scroll|enterAlways">
 
-                <ImageView
-                    android:id="@+id/profile_picture"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:layout_marginEnd="10dp"
-                    android:contentDescription="@string/profile_picture" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:id="@+id/title"
-                    style="@style/TextAppearance.AppCompat.Title"
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:ellipsize="end"
-                    android:maxLines="1" />
+                    android:layout_height="match_parent"
+                    android:gravity="center_vertical">
+
+                    <ImageView
+                        android:id="@+id/profile_picture"
+                        android:layout_width="30dp"
+                        android:layout_height="30dp"
+                        android:layout_marginEnd="10dp"
+                        android:contentDescription="@string/profile_picture" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/title"
+                        style="@style/TextAppearance.AppCompat.Title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:ellipsize="end"
+                        android:maxLines="1" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
             </androidx.appcompat.widget.Toolbar>
 
         </com.google.android.material.appbar.AppBarLayout>

From b06a8eb53a8fe5933c63e474196e3945de4fa575 Mon Sep 17 00:00:00 2001
From: 0xd9a <0xd9a@noreply.codeberg.org>
Date: Fri, 22 Aug 2025 16:55:24 +0530
Subject: [PATCH 4/5] Update change log

---
 src/fdroid/fastlane/metadata/android/en/changelogs/538.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/538.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/538.txt
index baa5d094..761c7d8c 100644
--- a/src/fdroid/fastlane/metadata/android/en/changelogs/538.txt
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/538.txt
@@ -3,6 +3,7 @@ Added:
 - Add accessibility action to toggle media sensitivity of posts in timelines
 - Add accessibility actions to translate, download, share in media viewer
 - Add a language indicator to focused status
+- Add Persian language to "Change the language" preference
 
 Changed:
 - Show placeholders while profile pictures are loading
@@ -20,3 +21,4 @@ Fixed:
 - Tapping publish button multiple times publishes status multiple times
 - Alt text popup does not resize when swiping
 - Video controls not visible in light theme
+- Profile picture appears on left side of title in conversation page in RTL mode

From 61d0372edabe36c98b37cfef70661b2a6b3e3c67 Mon Sep 17 00:00:00 2001
From: Alireza Rashidi <alirezarashidigoorabi@gmail.com>
Date: Fri, 22 Aug 2025 13:11:26 +0200
Subject: [PATCH 5/5] Translated using Weblate (Persian)

Currently translated at 97.4% (1223 of 1255 strings)

Co-authored-by: Alireza Rashidi <alirezarashidigoorabi@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/fedilab/strings/fa/
Translation: Fedilab/Strings
---
 app/src/main/res/values-fa/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index ab189e11..6bae13e3 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -720,7 +720,7 @@
     <string name="label_rectangle">مستطیل</string>
     <string name="messages_in_cache_for_other_timelines">بوق‌های نهان‌شده برای دیگر خط‌های زمانی</string>
     <string name="delete_cache_message">آیا مطمئنید که می‌خواهید حافظه نهان را پاک کنید؟ اگر پیش‌نویس‌هایی با رسانه دارید، رسانه‌های پیوست از دست می‌روند.</string>
-    <string name="change_logo_description">تغییر لوگوی برنامه در دستگاه شما</string>
+    <string name="change_logo_description">تغییر نماد برنامه در دستگاه شما</string>
     <string name="action_pin">سنجاق بوق</string>
     <string name="set_unlisted_replies">پاسخ‌های فهرست‌نشده</string>
     <string name="notification_remove_from_cache">آگاه‌سازی‌ها از حافظه نهان پاک شدند.</string>
@@ -876,7 +876,7 @@
     <string name="set_display_bookmark_indication">همیشه دکمه نشانه‌گذاری را نمایش بده</string>
     <string name="fetch_more_messages">دریافت بوق‌های بیشتر…</string>
     <string name="label_oval">بیضی</string>
-    <string name="pickup_logo">انتخاب لوگو</string>
+    <string name="pickup_logo">انتخاب نماد</string>
     <string name="restart">بازآغاز</string>
     <string name="chart_home_cache">سوابق حافظه نهان خانه در هر ساعت</string>
     <string name="auto">خودکار</string>
@@ -934,7 +934,7 @@
     <string name="poll_type_single">تک‌گزینه‌ای</string>
     <string name="poll_duration">مدت نظرسنجی:</string>
     <string name="set_display_translate_indication">همیشه دکمه ترجمه را نمایش بده</string>
-    <string name="change_logo">تغییر لوگو</string>
+    <string name="change_logo">تغییر نماد</string>
     <string name="toast_unpin">بوق دیگر سنجاق نیست!</string>
     <string name="keep_notifications">نگهداری آگاه‌سازی‌ها</string>
     <string name="set_notif_update">آگاه‌سازی برای به‌روزرسانی‌ها</string>